Skip to content

Commit 80749dd

Browse files
committed
normcase for Windows
1 parent 795f43d commit 80749dd

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
@@ -168,7 +168,9 @@ def test_uptodate_flag(script, data):
168168
assert {
169169
"name": "pip-test-package",
170170
"version": "0.1.1",
171-
"location": str(script.venv_path / "src" / "pip-test-package"),
171+
"location": os.path.normcase(
172+
str(script.venv_path / "src" / "pip-test-package")
173+
),
172174
} in json_result
173175
assert {"name": "simple2", "version": "3.0"} in json_result
174176

@@ -233,7 +235,9 @@ def test_outdated_flag(script, data):
233235
assert {
234236
"name": "pip-test-package",
235237
"version": "0.1",
236-
"location": str(script.venv_path / "src" / "pip-test-package"),
238+
"location": os.path.normcase(
239+
str(script.venv_path / "src" / "pip-test-package")
240+
),
237241
"latest_version": "0.1.1",
238242
"latest_filetype": "sdist",
239243
} in json.loads(result.stdout)

tests/functional/test_uninstall.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,12 @@ def test_uninstall_setuptools_develop_install(script, data):
506506
script.run('python', 'setup.py', 'install',
507507
expect_stderr=True, cwd=pkg_path)
508508
list_result = script.pip('list', '--format=json')
509+
egg_name = "FSPkg-0.1.dev0-py{0}.{1}.egg".format(*sys.version_info)
509510
assert {
510511
"name": os.path.normcase("FSPkg"),
511512
"version": "0.1.dev0",
512-
"location": str(
513-
script.site_packages_path /
514-
"FSPkg-0.1.dev0-py{0}.{1}.egg".format(*sys.version_info)
513+
"location": os.path.normcase(
514+
str(script.site_packages_path / egg_name)
515515
),
516516
} in json.loads(list_result.stdout), str(list_result)
517517
# Uninstall both develop and install
@@ -543,7 +543,7 @@ def test_uninstall_editable_and_pip_install(script, data):
543543
assert {
544544
"name": "FSPkg",
545545
"version": "0.1.dev0",
546-
"location": str(script.site_packages_path),
546+
"location": os.path.normcase(str(script.site_packages_path)),
547547
} in json.loads(list_result.stdout)
548548
# Uninstall both develop and install
549549
uninstall = script.pip('uninstall', 'FSPkg', '-y')

0 commit comments

Comments
 (0)