salfter/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-10-29 09:26:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[test_verbose_output] Fix tests under Python 3

Browse Source
This commit is contained in:
Yen Chi Hsuan
2016-08-13 17:36:14 +08:00
parent e97c55ee6a
commit 52aa7e7476
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/test_verbose_output.py
View File

@@ -22,10 +22,10 @@ class TestVerboseOutput(unittest.TestCase):
'--password', 'secret', '--password', 'secret',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
sout, serr = outp.communicate() sout, serr = outp.communicate()
self.assertTrue('--username' in serr) self.assertTrue(b'--username' in serr)
self.assertTrue('johnsmith' not in serr) self.assertTrue(b'johnsmith' not in serr)
self.assertTrue('--password' in serr) self.assertTrue(b'--password' in serr)
self.assertTrue('secret' not in serr) self.assertTrue(b'secret' not in serr)
def test_private_info_shortarg(self): def test_private_info_shortarg(self):
outp = subprocess.Popen( outp = subprocess.Popen(
@@ -35,10 +35,10 @@ class TestVerboseOutput(unittest.TestCase):
'-p', 'secret', '-p', 'secret',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
sout, serr = outp.communicate() sout, serr = outp.communicate()
self.assertTrue('-u' in serr) self.assertTrue(b'-u' in serr)
self.assertTrue('johnsmith' not in serr) self.assertTrue(b'johnsmith' not in serr)
self.assertTrue('-p' in serr) self.assertTrue(b'-p' in serr)
self.assertTrue('secret' not in serr) self.assertTrue(b'secret' not in serr)
def test_private_info_eq(self): def test_private_info_eq(self):
outp = subprocess.Popen( outp = subprocess.Popen(
@@ -48,10 +48,10 @@ class TestVerboseOutput(unittest.TestCase):
'--password=secret', '--password=secret',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
sout, serr = outp.communicate() sout, serr = outp.communicate()
self.assertTrue('--username' in serr) self.assertTrue(b'--username' in serr)
self.assertTrue('johnsmith' not in serr) self.assertTrue(b'johnsmith' not in serr)
self.assertTrue('--password' in serr) self.assertTrue(b'--password' in serr)
self.assertTrue('secret' not in serr) self.assertTrue(b'secret' not in serr)
def test_private_info_shortarg_eq(self): def test_private_info_shortarg_eq(self):
outp = subprocess.Popen( outp = subprocess.Popen(
@@ -61,10 +61,10 @@ class TestVerboseOutput(unittest.TestCase):
'-p=secret', '-p=secret',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
sout, serr = outp.communicate() sout, serr = outp.communicate()
self.assertTrue('-u' in serr) self.assertTrue(b'-u' in serr)
self.assertTrue('johnsmith' not in serr) self.assertTrue(b'johnsmith' not in serr)
self.assertTrue('-p' in serr) self.assertTrue(b'-p' in serr)
self.assertTrue('secret' not in serr) self.assertTrue(b'secret' not in serr)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()