Skip to content

Commit be32fec

Browse files
committed
Update tests to match new expectation.
1 parent 005ba4b commit be32fec

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

distutils/tests/test_sdist.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ def test_prune_file_list(self):
118118
# now let's check what we have
119119
dist_folder = join(self.tmp_dir, 'dist')
120120
files = os.listdir(dist_folder)
121-
assert files == ['fake-1.0.zip']
121+
assert files == ['fake-1.zip']
122122

123-
zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
123+
zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.zip'))
124124
try:
125125
content = zip_file.namelist()
126126
finally:
@@ -135,7 +135,7 @@ def test_prune_file_list(self):
135135
'somecode/',
136136
'somecode/__init__.py',
137137
]
138-
assert sorted(content) == ['fake-1.0/' + x for x in expected]
138+
assert sorted(content) == ['fake-1/' + x for x in expected]
139139

140140
@pytest.mark.usefixtures('needs_zlib')
141141
@pytest.mark.skipif("not find_executable('tar')")
@@ -153,10 +153,10 @@ def test_make_distribution(self):
153153
dist_folder = join(self.tmp_dir, 'dist')
154154
result = os.listdir(dist_folder)
155155
result.sort()
156-
assert result == ['fake-1.0.tar', 'fake-1.0.tar.gz']
156+
assert result == ['fake-1.tar', 'fake-1.tar.gz']
157157

158-
os.remove(join(dist_folder, 'fake-1.0.tar'))
159-
os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
158+
os.remove(join(dist_folder, 'fake-1.tar'))
159+
os.remove(join(dist_folder, 'fake-1.tar.gz'))
160160

161161
# now trying a tar then a gztar
162162
cmd.formats = ['tar', 'gztar']
@@ -166,7 +166,7 @@ def test_make_distribution(self):
166166

167167
result = os.listdir(dist_folder)
168168
result.sort()
169-
assert result == ['fake-1.0.tar', 'fake-1.0.tar.gz']
169+
assert result == ['fake-1.tar', 'fake-1.tar.gz']
170170

171171
@pytest.mark.usefixtures('needs_zlib')
172172
def test_add_defaults(self):
@@ -219,9 +219,9 @@ def test_add_defaults(self):
219219
# now let's check what we have
220220
dist_folder = join(self.tmp_dir, 'dist')
221221
files = os.listdir(dist_folder)
222-
assert files == ['fake-1.0.zip']
222+
assert files == ['fake-1.zip']
223223

224-
zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
224+
zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.zip'))
225225
try:
226226
content = zip_file.namelist()
227227
finally:
@@ -247,7 +247,7 @@ def test_add_defaults(self):
247247
'somecode/doc.dat',
248248
'somecode/doc.txt',
249249
]
250-
assert sorted(content) == ['fake-1.0/' + x for x in expected]
250+
assert sorted(content) == ['fake-1/' + x for x in expected]
251251

252252
# checking the MANIFEST
253253
manifest = pathlib.Path(self.tmp_dir, 'MANIFEST').read_text(encoding='utf-8')
@@ -420,16 +420,16 @@ def test_manual_manifest(self):
420420

421421
assert list(clean_lines(cmd.manifest)) == ['README.manual']
422422

423-
archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
423+
archive_name = join(self.tmp_dir, 'dist', 'fake-1.tar.gz')
424424
archive = tarfile.open(archive_name)
425425
try:
426426
filenames = [tarinfo.name for tarinfo in archive]
427427
finally:
428428
archive.close()
429429
assert sorted(filenames) == [
430-
'fake-1.0',
431-
'fake-1.0/PKG-INFO',
432-
'fake-1.0/README.manual',
430+
'fake-1',
431+
'fake-1/PKG-INFO',
432+
'fake-1/README.manual',
433433
]
434434

435435
@pytest.mark.usefixtures('needs_zlib')
@@ -449,7 +449,7 @@ def test_make_distribution_owner_group(self):
449449
cmd.run()
450450

451451
# making sure we have the good rights
452-
archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
452+
archive_name = join(self.tmp_dir, 'dist', 'fake-1.tar.gz')
453453
archive = tarfile.open(archive_name)
454454
try:
455455
for member in archive.getmembers():
@@ -467,7 +467,7 @@ def test_make_distribution_owner_group(self):
467467
cmd.run()
468468

469469
# making sure we have the good rights
470-
archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
470+
archive_name = join(self.tmp_dir, 'dist', 'fake-1.tar.gz')
471471
archive = tarfile.open(archive_name)
472472

473473
# note that we are not testing the group ownership here

0 commit comments

Comments
 (0)