Skip to content

Commit cf0b921

Browse files
committed
Fix pathing for windows
1 parent d637af0 commit cf0b921

File tree

1 file changed

+33
-21
lines changed

1 file changed

+33
-21
lines changed

pythonFiles/tests/pytestadapter/expected_discovery_test_output.py

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import pathlib
23

34
from .helpers import TEST_DATA_PATH, find_test_line_number
45

@@ -16,7 +17,7 @@
1617
# This is the expected output for the simple_pytest.py file.
1718
# └── simple_pytest.py
1819
# └── test_function
19-
simple_test_file_path = f"{TEST_DATA_PATH_STR}/simple_pytest.py"
20+
simple_test_file_path = os.fspath(TEST_DATA_PATH / "simple_pytest.py")
2021
simple_discovery_pytest_expected_output = {
2122
"name": ".data",
2223
"path": TEST_DATA_PATH_STR,
@@ -50,7 +51,7 @@
5051
# ├── TestExample
5152
# │ └── test_true_unittest
5253
# └── test_true_pytest
53-
unit_pytest_same_file_path = f"{TEST_DATA_PATH_STR}/unittest_pytest_same_file.py"
54+
unit_pytest_same_file_path = os.fspath(TEST_DATA_PATH / "unittest_pytest_same_file.py")
5455
unit_pytest_same_file_discovery_expected_output = {
5556
"name": ".data",
5657
"path": TEST_DATA_PATH_STR,
@@ -108,9 +109,9 @@
108109
# └── TestSubtractFunction
109110
# ├── test_subtract_negative_numbers
110111
# └── test_subtract_positive_numbers
111-
unittest_folder_path = f"{TEST_DATA_PATH_STR}/unittest_folder"
112-
test_add_path = f"{TEST_DATA_PATH_STR}/unittest_folder/test_add.py"
113-
test_subtract_path = f"{TEST_DATA_PATH_STR}/unittest_folder/test_subtract.py"
112+
unittest_folder_path = os.fspath(TEST_DATA_PATH / "unittest_folder")
113+
test_add_path = os.fspath(TEST_DATA_PATH / "unittest_folder" / "test_add.py")
114+
test_subtract_path = os.fspath(TEST_DATA_PATH / "unittest_folder" / "test_subtract.py")
114115
unittest_folder_discovery_expected_output = {
115116
"name": ".data",
116117
"path": TEST_DATA_PATH_STR,
@@ -213,14 +214,19 @@
213214
# └── test_bottom_folder.py
214215
# └── test_bottom_function_t
215216
# └── test_bottom_function_f
216-
dual_level_nested_folder_path = f"{TEST_DATA_PATH_STR}/dual_level_nested_folder"
217-
test_top_folder_path = (
218-
f"{TEST_DATA_PATH_STR}/dual_level_nested_folder/test_top_folder.py"
217+
dual_level_nested_folder_path = os.fspath(TEST_DATA_PATH / "dual_level_nested_folder")
218+
test_top_folder_path = os.fspath(
219+
TEST_DATA_PATH / "dual_level_nested_folder" / "test_top_folder.py"
219220
)
220-
test_nested_folder_one_path = (
221-
f"{TEST_DATA_PATH_STR}/dual_level_nested_folder/nested_folder_one"
221+
test_nested_folder_one_path = os.fspath(
222+
TEST_DATA_PATH / "dual_level_nested_folder" / "nested_folder_one"
223+
)
224+
test_bottom_folder_path = os.fspath(
225+
TEST_DATA_PATH
226+
/ "dual_level_nested_folder"
227+
/ "nested_folder_one"
228+
/ "test_bottom_folder.py"
222229
)
223-
test_bottom_folder_path = f"{TEST_DATA_PATH_STR}/dual_level_nested_folder/nested_folder_one/test_bottom_folder.py"
224230

225231
dual_level_nested_folder_expected_output = {
226232
"name": ".data",
@@ -313,24 +319,30 @@
313319
# └── nested_folder_two
314320
# └── test_nest.py
315321
# └── test_function
316-
double_nested_folder_path = f"{TEST_DATA_PATH_STR}/double_nested_folder"
317-
double_nested_folder_one_path = (
318-
f"{TEST_DATA_PATH_STR}/double_nested_folder/nested_folder_one"
322+
double_nested_folder_path = os.fspath(TEST_DATA_PATH / "double_nested_folder")
323+
double_nested_folder_one_path = os.fspath(
324+
TEST_DATA_PATH / "double_nested_folder" / "nested_folder_one"
325+
)
326+
double_nested_folder_two_path = os.fspath(
327+
TEST_DATA_PATH / "double_nested_folder" / "nested_folder_one" / "nested_folder_two"
319328
)
320-
double_nested_folder_two_path = (
321-
f"{TEST_DATA_PATH_STR}/double_nested_folder/nested_folder_one/nested_folder_two"
329+
double_nested_test_nest_path = os.fspath(
330+
TEST_DATA_PATH
331+
/ "double_nested_folder"
332+
/ "nested_folder_one"
333+
/ "nested_folder_two"
334+
/ "test_nest.py"
322335
)
323-
double_nested_test_nest_path = f"{TEST_DATA_PATH_STR}/double_nested_folder/nested_folder_one/nested_folder_two/test_nest.py"
324336
double_nested_folder_expected_output = {
325337
"name": ".data",
326338
"path": TEST_DATA_PATH_STR,
327339
"type_": "folder",
328340
"children": [
329341
{
330342
"name": "double_nested_folder",
331-
"path": f"{TEST_DATA_PATH_STR}/double_nested_folder",
343+
"path": double_nested_folder_path,
332344
"type_": "folder",
333-
"id_": f"{TEST_DATA_PATH_STR}/double_nested_folder",
345+
"id_": double_nested_folder_path,
334346
"children": [
335347
{
336348
"name": "nested_folder_one",
@@ -378,7 +390,7 @@
378390
# └── test_adding[3+5-8]
379391
# └── test_adding[2+4-6]
380392
# └── test_adding[6+9-16]
381-
parameterize_tests_path = f"{TEST_DATA_PATH_STR}/parametrize_tests.py"
393+
parameterize_tests_path = os.fspath(TEST_DATA_PATH / "parametrize_tests.py")
382394
parametrize_tests_expected_output = {
383395
"name": ".data",
384396
"path": TEST_DATA_PATH_STR,
@@ -431,7 +443,7 @@
431443

432444
# This is the expected output for the text_docstring.txt tests.
433445
# └── text_docstring.txt
434-
text_docstring_path = f"{TEST_DATA_PATH_STR}/text_docstring.txt"
446+
text_docstring_path = os.fspath(TEST_DATA_PATH / "text_docstring.txt")
435447
doctest_pytest_expected_output = {
436448
"name": ".data",
437449
"path": TEST_DATA_PATH_STR,

0 commit comments

Comments
 (0)