Skip to content

Commit 707b5e7

Browse files
author
Eric Snow
authored
Fix failing functional extension tests in CI related to pytest discovery. (#6944)
(for #6940) This is essentially a follow-up to #6877 (for #6758).
1 parent 2402dd5 commit 707b5e7

7 files changed

Lines changed: 176 additions & 56 deletions

File tree

‎news/2 Fixes/6940.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix failing functional tests (for pytest) in the extension.

‎src/test/pythonFiles/testFiles/pytestFiles/results/five.output‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"id": "./test_root.py",
88
"kind": "file",
99
"name": "test_root.py",
10-
"parentid": "."
10+
"parentid": ".",
11+
"relpath": "./test_root.py"
1112
},
1213
{
1314
"id": "./test_root.py::Test_Root_test1",
@@ -19,13 +20,15 @@
1920
"id": "./tests",
2021
"kind": "folder",
2122
"name": "tests",
22-
"parentid": "."
23+
"parentid": ".",
24+
"relpath": "./tests"
2325
},
2426
{
2527
"id": "./tests/test_another_pytest.py",
2628
"kind": "file",
2729
"name": "test_another_pytest.py",
28-
"parentid": "./tests"
30+
"parentid": "./tests",
31+
"relpath": "./tests/test_another_pytest.py"
2932
},
3033
{
3134
"id": "./tests/test_another_pytest.py::test_parametrized_username",
@@ -37,7 +40,8 @@
3740
"id": "./tests/test_foreign_nested_tests.py",
3841
"kind": "file",
3942
"name": "test_foreign_nested_tests.py",
40-
"parentid": "./tests"
43+
"parentid": "./tests",
44+
"relpath": "./tests/test_foreign_nested_tests.py"
4145
},
4246
{
4347
"id": "./tests/test_foreign_nested_tests.py::TestNestedForeignTests",
@@ -61,7 +65,8 @@
6165
"id": "./tests/test_pytest.py",
6266
"kind": "file",
6367
"name": "test_pytest.py",
64-
"parentid": "./tests"
68+
"parentid": "./tests",
69+
"relpath": "./tests/test_pytest.py"
6570
},
6671
{
6772
"id": "./tests/test_pytest.py::Test_CheckMyApp",
@@ -91,7 +96,8 @@
9196
"id": "./tests/test_unittest_one.py",
9297
"kind": "file",
9398
"name": "test_unittest_one.py",
94-
"parentid": "./tests"
99+
"parentid": "./tests",
100+
"relpath": "./tests/test_unittest_one.py"
95101
},
96102
{
97103
"id": "./tests/test_unittest_one.py::Test_test1",
@@ -103,7 +109,8 @@
103109
"id": "./tests/test_unittest_two.py",
104110
"kind": "file",
105111
"name": "test_unittest_two.py",
106-
"parentid": "./tests"
112+
"parentid": "./tests",
113+
"relpath": "./tests/test_unittest_two.py"
107114
},
108115
{
109116
"id": "./tests/test_unittest_two.py::Test_test2",
@@ -121,7 +128,8 @@
121128
"id": "./tests/unittest_three_test.py",
122129
"kind": "file",
123130
"name": "unittest_three_test.py",
124-
"parentid": "./tests"
131+
"parentid": "./tests",
132+
"relpath": "./tests/unittest_three_test.py"
125133
},
126134
{
127135
"id": "./tests/unittest_three_test.py::Test_test3",
@@ -364,4 +372,4 @@
364372
}
365373
]
366374
}
367-
]
375+
]

‎src/test/pythonFiles/testFiles/pytestFiles/results/four.output‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"id": "./test_root.py",
88
"kind": "file",
99
"name": "test_root.py",
10-
"parentid": "."
10+
"parentid": ".",
11+
"relpath": "./test_root.py"
1112
},
1213
{
1314
"id": "./test_root.py::Test_Root_test1",
@@ -19,13 +20,15 @@
1920
"id": "./tests",
2021
"kind": "folder",
2122
"name": "tests",
22-
"parentid": "."
23+
"parentid": ".",
24+
"relpath": "./tests"
2325
},
2426
{
2527
"id": "./tests/test_another_pytest.py",
2628
"kind": "file",
2729
"name": "test_another_pytest.py",
28-
"parentid": "./tests"
30+
"parentid": "./tests",
31+
"relpath": "./tests/test_another_pytest.py"
2932
},
3033
{
3134
"id": "./tests/test_another_pytest.py::test_parametrized_username",
@@ -37,7 +40,8 @@
3740
"id": "./tests/test_foreign_nested_tests.py",
3841
"kind": "file",
3942
"name": "test_foreign_nested_tests.py",
40-
"parentid": "./tests"
43+
"parentid": "./tests",
44+
"relpath": "./tests/test_foreign_nested_tests.py"
4145
},
4246
{
4347
"id": "./tests/test_foreign_nested_tests.py::TestNestedForeignTests",
@@ -61,7 +65,8 @@
6165
"id": "./tests/test_pytest.py",
6266
"kind": "file",
6367
"name": "test_pytest.py",
64-
"parentid": "./tests"
68+
"parentid": "./tests",
69+
"relpath": "./tests/test_pytest.py"
6570
},
6671
{
6772
"id": "./tests/test_pytest.py::Test_CheckMyApp",
@@ -91,7 +96,8 @@
9196
"id": "./tests/test_unittest_one.py",
9297
"kind": "file",
9398
"name": "test_unittest_one.py",
94-
"parentid": "./tests"
99+
"parentid": "./tests",
100+
"relpath": "./tests/test_unittest_one.py"
95101
},
96102
{
97103
"id": "./tests/test_unittest_one.py::Test_test1",
@@ -103,7 +109,8 @@
103109
"id": "./tests/test_unittest_two.py",
104110
"kind": "file",
105111
"name": "test_unittest_two.py",
106-
"parentid": "./tests"
112+
"parentid": "./tests",
113+
"relpath": "./tests/test_unittest_two.py"
107114
},
108115
{
109116
"id": "./tests/test_unittest_two.py::Test_test2",
@@ -121,7 +128,8 @@
121128
"id": "./tests/unittest_three_test.py",
122129
"kind": "file",
123130
"name": "unittest_three_test.py",
124-
"parentid": "./tests"
131+
"parentid": "./tests",
132+
"relpath": "./tests/unittest_three_test.py"
125133
},
126134
{
127135
"id": "./tests/unittest_three_test.py::Test_test3",
@@ -364,4 +372,4 @@
364372
}
365373
]
366374
}
367-
]
375+
]

‎src/test/pythonFiles/testFiles/pytestFiles/results/one.output‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"id": "./test_root.py",
88
"kind": "file",
99
"name": "test_root.py",
10-
"parentid": "."
10+
"parentid": ".",
11+
"relpath": "./test_root.py"
1112
},
1213
{
1314
"id": "./test_root.py::Test_Root_test1",
@@ -19,13 +20,15 @@
1920
"id": "./tests",
2021
"kind": "folder",
2122
"name": "tests",
22-
"parentid": "."
23+
"parentid": ".",
24+
"relpath": "./tests"
2325
},
2426
{
2527
"id": "./tests/test_another_pytest.py",
2628
"kind": "file",
2729
"name": "test_another_pytest.py",
28-
"parentid": "./tests"
30+
"parentid": "./tests",
31+
"relpath": "./tests/test_another_pytest.py"
2932
},
3033
{
3134
"id": "./tests/test_another_pytest.py::test_parametrized_username",
@@ -37,7 +40,8 @@
3740
"id": "./tests/test_foreign_nested_tests.py",
3841
"kind": "file",
3942
"name": "test_foreign_nested_tests.py",
40-
"parentid": "./tests"
43+
"parentid": "./tests",
44+
"relpath": "./tests/test_foreign_nested_tests.py"
4145
},
4246
{
4347
"id": "./tests/test_foreign_nested_tests.py::TestNestedForeignTests",
@@ -61,7 +65,8 @@
6165
"id": "./tests/test_pytest.py",
6266
"kind": "file",
6367
"name": "test_pytest.py",
64-
"parentid": "./tests"
68+
"parentid": "./tests",
69+
"relpath": "./tests/test_pytest.py"
6570
},
6671
{
6772
"id": "./tests/test_pytest.py::Test_CheckMyApp",
@@ -91,7 +96,8 @@
9196
"id": "./tests/test_unittest_one.py",
9297
"kind": "file",
9398
"name": "test_unittest_one.py",
94-
"parentid": "./tests"
99+
"parentid": "./tests",
100+
"relpath": "./tests/test_unittest_one.py"
95101
},
96102
{
97103
"id": "./tests/test_unittest_one.py::Test_test1",
@@ -103,7 +109,8 @@
103109
"id": "./tests/test_unittest_two.py",
104110
"kind": "file",
105111
"name": "test_unittest_two.py",
106-
"parentid": "./tests"
112+
"parentid": "./tests",
113+
"relpath": "./tests/test_unittest_two.py"
107114
},
108115
{
109116
"id": "./tests/test_unittest_two.py::Test_test2",
@@ -121,7 +128,8 @@
121128
"id": "./tests/unittest_three_test.py",
122129
"kind": "file",
123130
"name": "unittest_three_test.py",
124-
"parentid": "./tests"
131+
"parentid": "./tests",
132+
"relpath": "./tests/unittest_three_test.py"
125133
},
126134
{
127135
"id": "./tests/unittest_three_test.py::Test_test3",
@@ -364,4 +372,4 @@
364372
}
365373
]
366374
}
367-
]
375+
]

‎src/test/pythonFiles/testFiles/pytestFiles/results/three.output‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"id": "./test_root.py",
88
"kind": "file",
99
"name": "test_root.py",
10-
"parentid": "."
10+
"parentid": ".",
11+
"relpath": "./test_root.py"
1112
},
1213
{
1314
"id": "./test_root.py::Test_Root_test1",
@@ -19,13 +20,15 @@
1920
"id": "./tests",
2021
"kind": "folder",
2122
"name": "tests",
22-
"parentid": "."
23+
"parentid": ".",
24+
"relpath": "./tests"
2325
},
2426
{
2527
"id": "./tests/test_another_pytest.py",
2628
"kind": "file",
2729
"name": "test_another_pytest.py",
28-
"parentid": "./tests"
30+
"parentid": "./tests",
31+
"relpath": "./tests/test_another_pytest.py"
2932
},
3033
{
3134
"id": "./tests/test_another_pytest.py::test_parametrized_username",
@@ -37,7 +40,8 @@
3740
"id": "./tests/test_foreign_nested_tests.py",
3841
"kind": "file",
3942
"name": "test_foreign_nested_tests.py",
40-
"parentid": "./tests"
43+
"parentid": "./tests",
44+
"relpath": "./tests/test_foreign_nested_tests.py"
4145
},
4246
{
4347
"id": "./tests/test_foreign_nested_tests.py::TestNestedForeignTests",
@@ -61,7 +65,8 @@
6165
"id": "./tests/test_pytest.py",
6266
"kind": "file",
6367
"name": "test_pytest.py",
64-
"parentid": "./tests"
68+
"parentid": "./tests",
69+
"relpath": "./tests/test_pytest.py"
6570
},
6671
{
6772
"id": "./tests/test_pytest.py::Test_CheckMyApp",
@@ -91,7 +96,8 @@
9196
"id": "./tests/test_unittest_one.py",
9297
"kind": "file",
9398
"name": "test_unittest_one.py",
94-
"parentid": "./tests"
99+
"parentid": "./tests",
100+
"relpath": "./tests/test_unittest_one.py"
95101
},
96102
{
97103
"id": "./tests/test_unittest_one.py::Test_test1",
@@ -103,7 +109,8 @@
103109
"id": "./tests/test_unittest_two.py",
104110
"kind": "file",
105111
"name": "test_unittest_two.py",
106-
"parentid": "./tests"
112+
"parentid": "./tests",
113+
"relpath": "./tests/test_unittest_two.py"
107114
},
108115
{
109116
"id": "./tests/test_unittest_two.py::Test_test2",
@@ -121,7 +128,8 @@
121128
"id": "./tests/unittest_three_test.py",
122129
"kind": "file",
123130
"name": "unittest_three_test.py",
124-
"parentid": "./tests"
131+
"parentid": "./tests",
132+
"relpath": "./tests/unittest_three_test.py"
125133
},
126134
{
127135
"id": "./tests/unittest_three_test.py::Test_test3",
@@ -364,4 +372,4 @@
364372
}
365373
]
366374
}
367-
]
375+
]

0 commit comments

Comments
 (0)