Skip to content

Commit 88e2ef5

Browse files
eleanorjboydeleanorjboyd
authored
Fix bug that errors on repeat folder name (#21433)
fixes #21423 fixes so the dictionary that stores the folders created so far in the plugin architecture is using the folder path as the key instead of folder name so the key is always unique.
1 parent e1c50ae commit 88e2ef5

6 files changed

Lines changed: 40 additions & 46 deletions

File tree

pythonFiles/tests/pytestadapter/.data/double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py renamed to pythonFiles/tests/pytestadapter/.data/folder_a/folder_b/folder_a/test_nest.py

File renamed without changes.

‎pythonFiles/tests/pytestadapter/expected_discovery_test_output.py‎

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -315,64 +315,57 @@
315315
}
316316

317317
# This is the expected output for the double_nested_folder tests.
318-
# └── double_nested_folder
319-
# └── nested_folder_one
320-
# └── nested_folder_two
318+
# └── folder_a
319+
# └── folder_b
320+
# └── folder_a
321321
# └── test_nest.py
322322
# └── test_function
323-
double_nested_folder_path = os.fspath(TEST_DATA_PATH / "double_nested_folder")
324-
double_nested_folder_one_path = os.fspath(
325-
TEST_DATA_PATH / "double_nested_folder" / "nested_folder_one"
326-
)
327-
double_nested_folder_two_path = os.fspath(
328-
TEST_DATA_PATH / "double_nested_folder" / "nested_folder_one" / "nested_folder_two"
329-
)
330-
double_nested_test_nest_path = os.fspath(
331-
TEST_DATA_PATH
332-
/ "double_nested_folder"
333-
/ "nested_folder_one"
334-
/ "nested_folder_two"
335-
/ "test_nest.py"
323+
324+
folder_a_path = os.fspath(TEST_DATA_PATH / "folder_a")
325+
folder_b_path = os.fspath(TEST_DATA_PATH / "folder_a" / "folder_b")
326+
folder_a_nested_path = os.fspath(TEST_DATA_PATH / "folder_a" / "folder_b" / "folder_a")
327+
test_nest_path = os.fspath(
328+
TEST_DATA_PATH / "folder_a" / "folder_b" / "folder_a" / "test_nest.py"
336329
)
337330
double_nested_folder_expected_output = {
338331
"name": ".data",
339332
"path": TEST_DATA_PATH_STR,
340333
"type_": "folder",
341334
"children": [
342335
{
343-
"name": "double_nested_folder",
344-
"path": double_nested_folder_path,
336+
"name": "folder_a",
337+
"path": folder_a_path,
345338
"type_": "folder",
346-
"id_": double_nested_folder_path,
339+
"id_": folder_a_path,
347340
"children": [
348341
{
349-
"name": "nested_folder_one",
350-
"path": double_nested_folder_one_path,
342+
"name": "folder_b",
343+
"path": folder_b_path,
351344
"type_": "folder",
352-
"id_": double_nested_folder_one_path,
345+
"id_": folder_b_path,
353346
"children": [
354347
{
355-
"name": "nested_folder_two",
356-
"path": double_nested_folder_two_path,
348+
"name": "folder_a",
349+
"path": folder_a_nested_path,
357350
"type_": "folder",
358-
"id_": double_nested_folder_two_path,
351+
"id_": folder_a_nested_path,
359352
"children": [
360353
{
361354
"name": "test_nest.py",
362-
"path": double_nested_test_nest_path,
355+
"path": test_nest_path,
363356
"type_": "file",
364-
"id_": double_nested_test_nest_path,
357+
"id_": test_nest_path,
365358
"children": [
366359
{
367360
"name": "test_function",
368-
"path": double_nested_test_nest_path,
361+
"path": test_nest_path,
369362
"lineno": find_test_line_number(
370363
"test_function",
371-
double_nested_test_nest_path,
364+
test_nest_path,
372365
),
373366
"type_": "test",
374-
"id_": "double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function",
375-
"runID": "double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function",
367+
"id_": "folder_a/folder_b/folder_a/test_nest.py::test_function",
368+
"runID": "folder_a/folder_b/folder_a/test_nest.py::test_function",
376369
}
377370
],
378371
}

‎pythonFiles/tests/pytestadapter/expected_execution_test_output.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,14 @@
191191
}
192192

193193
# This is the expected output for the nested_folder tests.
194-
# └── nested_folder_one
195-
# └── nested_folder_two
196-
# └── test_nest.py
197-
# └── test_function: success
194+
# └── folder_a
195+
# └── folder_b
196+
# └── folder_a
197+
# └── test_nest.py
198+
# └── test_function: success
198199
double_nested_folder_expected_execution_output = {
199-
"double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function": {
200-
"test": "double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function",
200+
"folder_a/folder_b/folder_a/test_nest.py::test_function": {
201+
"test": "folder_a/folder_b/folder_a/test_nest.py::test_function",
201202
"outcome": "success",
202203
"message": None,
203204
"traceback": None,
@@ -262,8 +263,8 @@
262263

263264
# Will run all tests in the cwd that fit the test file naming pattern.
264265
no_test_ids_pytest_execution_expected_output = {
265-
"double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function": {
266-
"test": "double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function",
266+
"folder_a/folder_b/folder_a/test_nest.py::test_function": {
267+
"test": "folder_a/folder_b/folder_a/test_nest.py::test_function",
267268
"outcome": "success",
268269
"message": None,
269270
"traceback": None,

‎pythonFiles/tests/pytestadapter/test_discovery.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def test_parameterized_error_collect():
8585
expected_discovery_test_output.dual_level_nested_folder_expected_output,
8686
),
8787
(
88-
"double_nested_folder",
88+
"folder_a",
8989
expected_discovery_test_output.double_nested_folder_expected_output,
9090
),
9191
(

‎pythonFiles/tests/pytestadapter/test_execution.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ def test_bad_id_error_execution():
103103
expected_execution_test_output.dual_level_nested_folder_execution_expected_output,
104104
),
105105
(
106-
[
107-
"double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py::test_function"
108-
],
106+
["folder_a/folder_b/folder_a/test_nest.py::test_function"],
109107
expected_execution_test_output.double_nested_folder_expected_execution_output,
110108
),
111109
(

‎pythonFiles/vscode_pytest/__init__.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def build_nested_folders(
316316
Keyword arguments:
317317
file_module -- the created module for the file we are nesting.
318318
file_node -- the file node that we are building the nested folders for.
319-
created_files_folders_dict -- Dictionary of all the folders and files that have been created.
319+
created_files_folders_dict -- Dictionary of all the folders and files that have been created where the key is the path.
320320
session -- the pytest session object.
321321
"""
322322
prev_folder_node = file_node
@@ -326,12 +326,14 @@ def build_nested_folders(
326326
while iterator_path != session.path:
327327
curr_folder_name = iterator_path.name
328328
try:
329-
curr_folder_node: TestNode = created_files_folders_dict[curr_folder_name]
329+
curr_folder_node: TestNode = created_files_folders_dict[
330+
os.fspath(iterator_path)
331+
]
330332
except KeyError:
331333
curr_folder_node: TestNode = create_folder_node(
332334
curr_folder_name, iterator_path
333335
)
334-
created_files_folders_dict[curr_folder_name] = curr_folder_node
336+
created_files_folders_dict[os.fspath(iterator_path)] = curr_folder_node
335337
if prev_folder_node not in curr_folder_node["children"]:
336338
curr_folder_node["children"].append(prev_folder_node)
337339
iterator_path = iterator_path.parent

0 commit comments

Comments
 (0)