diff options
-rw-r--r-- | test/run_all_tests.py | 1 | ||||
-rw-r--r-- | test/test.py | 28 | ||||
-rw-r--r-- | test/test_iolib.py | 4 | ||||
-rw-r--r-- | test/test_settings_dict.py | 12 |
4 files changed, 22 insertions, 23 deletions
diff --git a/test/run_all_tests.py b/test/run_all_tests.py index 3789fe5..8c02dbf 100644 --- a/test/run_all_tests.py +++ b/test/run_all_tests.py @@ -9,7 +9,6 @@ summary. import unittest import sys import os -import time # inject local copy to avoid testing the installed version instead of the sys.path.insert(0, os.path.dirname(os.path.dirname(__file__))) diff --git a/test/test.py b/test/test.py index b2ec7c6..440a7e4 100644 --- a/test/test.py +++ b/test/test.py @@ -72,7 +72,7 @@ class Test4_Nonblocking(unittest.TestCase): self.s.write(block) # there might be a small delay until the character is ready (especially on win32) time.sleep(0.05) - self.failUnlessEqual(self.s.inWaiting(), length, "expected exactly %d character for inWainting()" % length) + self.failUnlessEqual(self.s.in_waiting, length, "expected exactly %d character for inWainting()" % length) self.failUnlessEqual(self.s.read(length), block)#, "expected a %r which was written before" % block) self.failUnlessEqual(self.s.read(1), data(''), "expected empty buffer after all sent chars are read") @@ -148,8 +148,8 @@ class Test2_Forever(unittest.TestCase): self.s.close() def test1_inWaitingEmpty(self): - """no timeout: after port open, the input buffer must be empty (inWaiting)""" - self.failUnlessEqual(self.s.inWaiting(), 0, "expected empty buffer") + """no timeout: after port open, the input buffer must be empty (in_waiting)""" + self.failUnlessEqual(self.s.in_waiting, 0, "expected empty buffer") def test2_Loopback(self): """no timeout: each sent character should return (binary test). @@ -159,9 +159,9 @@ class Test2_Forever(unittest.TestCase): self.s.write(block) # there might be a small delay until the character is ready (especially on win32 and rfc2217) time.sleep(0.05) - self.failUnlessEqual(self.s.inWaiting(), length)#, "expected exactly %d character for inWainting()" % length) + self.failUnlessEqual(self.s.in_waiting, length)#, "expected exactly %d character for inWainting()" % length) self.failUnlessEqual(self.s.read(length), block) #, "expected %r which was written before" % block) - self.failUnlessEqual(self.s.inWaiting(), 0, "expected empty buffer after all sent chars are read") + self.failUnlessEqual(self.s.in_waiting, 0, "expected empty buffer after all sent chars are read") class Test0_DataWires(unittest.TestCase): @@ -174,25 +174,25 @@ class Test0_DataWires(unittest.TestCase): def test1_RTS(self): """Test RTS/CTS""" - self.s.setRTS(0) + self.s.rts = False time.sleep(1.1) - self.failUnless(not self.s.getCTS(), "CTS -> 0") - self.s.setRTS(1) + self.failUnless(not self.s.cts, "CTS -> 0") + self.s.rts = True time.sleep(1.1) - self.failUnless(self.s.getCTS(), "CTS -> 1") + self.failUnless(self.s.cts, "CTS -> 1") def test2_DTR(self): """Test DTR/DSR""" - self.s.setDTR(0) + self.s.dtr = False time.sleep(1.1) - self.failUnless(not self.s.getDSR(), "DSR -> 0") - self.s.setDTR(1) + self.failUnless(not self.s.dsr, "DSR -> 0") + self.s.dtr = True time.sleep(1.1) - self.failUnless(self.s.getDSR(), "DSR -> 1") + self.failUnless(self.s.dsr, "DSR -> 1") def test3_RI(self): """Test RI""" - self.failUnless(not self.s.getRI(), "RI -> 0") + self.failUnless(not self.s.ri, "RI -> 0") class Test_MoreTimeouts(unittest.TestCase): diff --git a/test/test_iolib.py b/test/test_iolib.py index 8d76e45..37ee081 100644 --- a/test/test_iolib.py +++ b/test/test_iolib.py @@ -63,10 +63,10 @@ class Test_SerialAndIO(unittest.TestCase): self.s.close() def test_hello_raw(self): - self.io.write(unicode("hello\n")) + self.io.write(r"hello\n") self.io.flush() # it is buffering. required to get the data out hello = self.io.readline() - self.failUnlessEqual(hello, unicode("hello\n")) + self.failUnlessEqual(hello, u"hello\n") # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if __name__ == '__main__': diff --git a/test/test_settings_dict.py b/test/test_settings_dict.py index 2e2e77f..11ff476 100644 --- a/test/test_settings_dict.py +++ b/test/test_settings_dict.py @@ -29,7 +29,7 @@ PORT = 0 SETTINGS = ('baudrate', 'bytesize', 'parity', 'stopbits', 'xonxoff', - 'dsrdtr', 'rtscts', 'timeout', 'writeTimeout', 'interCharTimeout') + 'dsrdtr', 'rtscts', 'timeout', 'write_timeout', 'inter_byte_timeout') class Test_SettingsDict(unittest.TestCase): @@ -44,24 +44,24 @@ class Test_SettingsDict(unittest.TestCase): def test_getsettings(self): """the settings dict reflects the current settings""" - d = self.s.getSettingsDict() + d = self.s.get_settings() for setting in SETTINGS: self.failUnlessEqual(getattr(self.s, setting), d[setting]) def test_partial_settings(self): """partial settings dictionaries are also accepted""" - d = self.s.getSettingsDict() + d = self.s.get_settings() del d['baudrate'] del d['bytesize'] - self.s.applySettingsDict(d) + self.s.apply_settings(d) for setting in d: self.failUnlessEqual(getattr(self.s, setting), d[setting]) def test_unknown_settings(self): """unknown settings are ignored""" - d = self.s.getSettingsDict() + d = self.s.get_settings() d['foobar'] = 'ignore me' - self.s.applySettingsDict(d) + self.s.apply_settings(d) if __name__ == '__main__': |