diff options
author | Thomas Kluyver <takowl@gmail.com> | 2013-09-23 11:29:08 -0700 |
---|---|---|
committer | Thomas Kluyver <takowl@gmail.com> | 2013-09-23 11:29:08 -0700 |
commit | ada77b55de931f774faad15812b9f6d9a996392a (patch) | |
tree | 594f07762eacef3e1784b41491c6d74242b7539a /tests/test_performance.py | |
parent | bf1dcd269edb62aa99d8e1ce00212afc2b2e1773 (diff) | |
download | pexpect-git-ada77b55de931f774faad15812b9f6d9a996392a.tar.gz |
Don't use six for tests
Diffstat (limited to 'tests/test_performance.py')
-rwxr-xr-x | tests/test_performance.py | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/tests/test_performance.py b/tests/test_performance.py index 519e168..4b6c078 100755 --- a/tests/test_performance.py +++ b/tests/test_performance.py @@ -18,14 +18,12 @@ PEXPECT LICENSE OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ''' -from __future__ import with_statement +from __future__ import print_function -import unittest, time, sys +import unittest, time import pexpect import PexpectTestCase -from pexpect import six - # This isn't exactly a unit test, but it fits in nicely with the rest of the tests. class PerformanceTestCase (PexpectTestCase.PexpectTestCase): @@ -35,58 +33,58 @@ class PerformanceTestCase (PexpectTestCase.PexpectTestCase): def plain_range(self, n): e = pexpect.spawn('python') - self.assertEqual(e.expect(six.b('>>>')), 0) - e.sendline(six.b('for n in range(1, %d+1): print(n)' % n)) - self.assertEqual(e.expect(six.b(r'\.{3}')), 0) - e.sendline(six.b('')) - self.assertEqual(e.expect([six.b('inquisition'), six.b('%d' % n)]), 1) + self.assertEqual(e.expect(b'>>>'), 0) + e.sendline(b'for n in range(1, %d+1): print(n)' % n) + self.assertEqual(e.expect(br'\.{3}'), 0) + e.sendline(b'') + self.assertEqual(e.expect([b'inquisition', b'%d' % n]), 1) def window_range(self, n): e = pexpect.spawn('python') - self.assertEqual(e.expect(six.b('>>>')), 0) - e.sendline(six.b('for n in range(1, %d+1): print(n)' % n)) + self.assertEqual(e.expect(b'>>>'), 0) + e.sendline(b'for n in range(1, %d+1): print(n)' % n) self.assertEqual(e.expect(r'\.{3}'), 0) - e.sendline(six.b('')) - self.assertEqual(e.expect([six.b('inquisition'), six.b('%d' % n)], searchwindowsize=10), 1) + e.sendline(b'') + self.assertEqual(e.expect([b'inquisition', b'%d' % n], searchwindowsize=10), 1) def exact_range(self, n): e = pexpect.spawn('python') - self.assertEqual(e.expect_exact([six.b('>>>')]), 0) - e.sendline(six.b('for n in range(1, %d+1): print(n)' % n)) - self.assertEqual(e.expect_exact([six.b('...')]), 0) - e.sendline(six.b('')) - self.assertEqual(e.expect_exact([six.b('inquisition'), six.b('%d' % n)],timeout=520), 1) + self.assertEqual(e.expect_exact([b'>>>']), 0) + e.sendline(b'for n in range(1, %d+1): print(n)' % n) + self.assertEqual(e.expect_exact([b'...']), 0) + e.sendline(b'') + self.assertEqual(e.expect_exact([b'inquisition', b'%d' % n],timeout=520), 1) def ewin_range(self, n): e = pexpect.spawn('python') - self.assertEqual(e.expect_exact([six.b('>>>')]), 0) - e.sendline(six.b('for n in range(1, %d+1): print(n)' % n)) - self.assertEqual(e.expect_exact([six.b('...')]), 0) - e.sendline(six.b('')) - self.assertEqual(e.expect_exact([six.b('inquisition'), six.b('%d' % n)], searchwindowsize=10), 1) + self.assertEqual(e.expect_exact([b'>>>']), 0) + e.sendline(b'for n in range(1, %d+1): print(n)' % n) + self.assertEqual(e.expect_exact([b'...']), 0) + e.sendline(b'') + self.assertEqual(e.expect_exact([b'inquisition', b'%d' % n], searchwindowsize=10), 1) def faster_range(self, n): e = pexpect.spawn('python') - self.assertEqual(e.expect(six.b('>>>')), 0) - e.sendline(six.b('range(1, %d+1)' % n)) - self.assertEqual(e.expect([six.b('inquisition'), six.b('%d' % n)]), 1) + self.assertEqual(e.expect(b'>>>'), 0) + e.sendline(b'range(1, %d+1)' % n) + self.assertEqual(e.expect([b'inquisition', b'%d' % n]), 1) def test_100000(self): start_time = time.time() self.plain_range (100000) - six.print_("100000 calls to plain_range:", (time.time() - start_time)) + print("100000 calls to plain_range:", (time.time() - start_time)) start_time = time.time() self.window_range(100000) - six.print_("100000 calls to window_range:", (time.time() - start_time)) + print("100000 calls to window_range:", (time.time() - start_time)) start_time = time.time() self.exact_range (100000) - six.print_("100000 calls to exact_range:", (time.time() - start_time)) + print("100000 calls to exact_range:", (time.time() - start_time)) start_time = time.time() self.ewin_range (100000) - six.print_("100000 calls to ewin_range:", (time.time() - start_time)) + print("100000 calls to ewin_range:", (time.time() - start_time)) start_time = time.time() self.faster_range(100000) - six.print_("100000 calls to faster_range:", (time.time() - start_time)) + print("100000 calls to faster_range:", (time.time() - start_time)) if __name__ == "__main__": unittest.main() |