Skip to content

bpo-28494: Test existing zipfile working behavior. #15853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2019
Merged

bpo-28494: Test existing zipfile working behavior. #15853

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe98bb
bpo-28494: Test existing zipfile working behavior.
gpshead Sep 10, 2019
5bab3f1
Skip #!/bin/bash test when /bin/bash isn't...
gpshead Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,11 +2496,15 @@ def test_read_zip64_with_exe_prepended(self):
self._test_zip_works(self.exe_zip64)

@unittest.skipUnless(sys.executable, 'sys.executable required.')
@unittest.skipUnless(os.access('/bin/bash', os.X_OK),
Copy link
Member

@Yhg1s Yhg1s Sep 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using shutil.which('bash') instead? There are some windows machines with bash installed now... will the test work there?

Copy link
Member Author

@gpshead gpshead Sep 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't think windows supported #! line executables as a concept. executable is based on filename ending in bat/cmd/com/exe, not an execute bit there.

'Test relies on #!/bin/bash working.')
def test_execute_zip2(self):
output = subprocess.check_output([self.exe_zip, sys.executable])
self.assertIn(b'number in executable: 5', output)

@unittest.skipUnless(sys.executable, 'sys.executable required.')
@unittest.skipUnless(os.access('/bin/bash', os.X_OK),
'Test relies on #!/bin/bash working.')
def test_execute_zip64(self):
output = subprocess.check_output([self.exe_zip64, sys.executable])
self.assertIn(b'number in executable: 5', output)
Expand Down