Skip to content

Commit 13a1258

Browse files
committed
fix tests for windows
1 parent ab541b6 commit 13a1258

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎tests/test_bundle.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ def test_make_notebook_source_bundle1(self):
119119
],
120120
)
121121

122+
# Compare to the file on disk. On Windows, git can check out the fixture with CRLF line endings.
122123
reqs = tar.extractfile("requirements.txt").read()
123-
self.assertEqual(reqs, b"numpy\npandas\nmatplotlib\n")
124+
self.assertEqual(reqs, Path(directory, "requirements.txt").read_bytes())
124125

125126
manifest = json.loads(tar.extractfile("manifest.json").read().decode("utf-8"))
126127

@@ -160,7 +161,7 @@ def test_make_notebook_source_bundle1(self):
160161
"dummy.ipynb": {
161162
"checksum": ipynb_hash,
162163
},
163-
"requirements.txt": {"checksum": "5f2a5e862fe7afe3def4a57bb5cfb214"},
164+
"requirements.txt": {"checksum": file_checksum(Path(directory, "requirements.txt"))},
164165
},
165166
},
166167
)

‎tests/test_environment.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ def test_get_default_locale(self):
4545
self.assertEqual(get_default_locale(lambda: (None, None)), "")
4646

4747
def test_file(self):
48-
result = Environment.create_python_environment(get_dir("pip1"))
48+
directory = get_dir("pip1")
49+
result = Environment.create_python_environment(directory)
4950

5051
self.assertTrue(version_re.match(result.pip))
5152

@@ -54,7 +55,7 @@ def test_file(self):
5455

5556
expected = Environment.from_dict(
5657
dict(
57-
contents="numpy\npandas\nmatplotlib\n",
58+
contents=Path(directory, "requirements.txt").read_bytes().decode("utf-8"),
5859
filename="requirements.txt",
5960
locale=result.locale,
6061
package_manager="pip",
@@ -73,7 +74,7 @@ def test_requirements_override(self):
7374
shutil.copytree(get_dir("pip1"), project_dir)
7475
os.makedirs(os.path.join(project_dir, "alt"), exist_ok=True)
7576
custom_requirements = os.path.join(project_dir, "alt", "custom.txt")
76-
with open(custom_requirements, "w") as f:
77+
with open(custom_requirements, "w", newline="\n") as f:
7778
f.write("foo==1.0\nbar>=2.0\nrsconnect==0.1\n")
7879

7980
result = Environment.create_python_environment(

0 commit comments

Comments
 (0)