Skip to content

Commit 33f62e2

Browse files
committed
normcase for Windows
1 parent 317b187 commit 33f62e2

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

tests/functional/test_list.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ def test_uptodate_flag(script, data):
154154
assert {
155155
"name": "pip-test-package",
156156
"version": "0.1.1",
157-
"location": str(script.venv_path / "src" / "pip-test-package"),
157+
"location": os.path.normcase(
158+
str(script.venv_path / "src" / "pip-test-package")
159+
),
158160
} in json_result
159161
assert {"name": "simple2", "version": "3.0"} in json_result
160162

@@ -219,7 +221,9 @@ def test_outdated_flag(script, data):
219221
assert {
220222
"name": "pip-test-package",
221223
"version": "0.1",
222-
"location": str(script.venv_path / "src" / "pip-test-package"),
224+
"location": os.path.normcase(
225+
str(script.venv_path / "src" / "pip-test-package")
226+
),
223227
"latest_version": "0.1.1",
224228
"latest_filetype": "sdist",
225229
} in json.loads(result.stdout)

tests/functional/test_uninstall.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,12 @@ def test_uninstall_setuptools_develop_install(script, data):
510510
script.run('python', 'setup.py', 'install',
511511
expect_stderr=True, cwd=pkg_path)
512512
list_result = script.pip('list', '--format=json')
513+
egg_name = "FSPkg-0.1.dev0-py{0}.{1}.egg".format(*sys.version_info)
513514
assert {
514515
"name": os.path.normcase("FSPkg"),
515516
"version": "0.1.dev0",
516-
"location": str(
517-
script.site_packages_path /
518-
"FSPkg-0.1.dev0-py{0}.{1}.egg".format(*sys.version_info)
517+
"location": os.path.normcase(
518+
str(script.site_packages_path / egg_name)
519519
),
520520
} in json.loads(list_result.stdout), str(list_result)
521521
# Uninstall both develop and install
@@ -547,7 +547,7 @@ def test_uninstall_editable_and_pip_install(script, data):
547547
assert {
548548
"name": "FSPkg",
549549
"version": "0.1.dev0",
550-
"location": str(script.site_packages_path),
550+
"location": os.path.normcase(str(script.site_packages_path)),
551551
} in json.loads(list_result.stdout)
552552
# Uninstall both develop and install
553553
uninstall = script.pip('uninstall', 'FSPkg', '-y')

0 commit comments

Comments
 (0)