@@ -96,9 +96,9 @@ def test_readers_nonexclusive_access(self):
9696 self .assertEqual ([], threads [0 ].buffer_read )
9797 self .assertEqual ([1 ], threads [2 ].buffer_read )
9898 self .assertEqual ([1 ], threads [3 ].buffer_read )
99- self .assert_ (threads [1 ].exit_time <= threads [2 ].entry_time )
100- self .assert_ (threads [2 ].entry_time <= threads [3 ].entry_time )
101- self .assert_ (threads [3 ].exit_time < threads [2 ].exit_time )
99+ self .assertTrue (threads [1 ].exit_time <= threads [2 ].entry_time )
100+ self .assertTrue (threads [2 ].entry_time <= threads [3 ].entry_time )
101+ self .assertTrue (threads [3 ].exit_time < threads [2 ].exit_time )
102102
103103 def test_writers_exclusive_access (self ):
104104 (buffer_ , rw_lock , threads ) = self .__init_variables ()
@@ -112,8 +112,8 @@ def test_writers_exclusive_access(self):
112112 ## The second writer should wait for the first one to exit
113113
114114 self .assertEqual ([1 , 2 ], threads [2 ].buffer_read )
115- self .assert_ (threads [0 ].exit_time <= threads [1 ].entry_time )
116- self .assert_ (threads [1 ].exit_time <= threads [2 ].exit_time )
115+ self .assertTrue (threads [0 ].exit_time <= threads [1 ].entry_time )
116+ self .assertTrue (threads [1 ].exit_time <= threads [2 ].exit_time )
117117
118118 def test_writer_priority (self ):
119119 (buffer_ , rw_lock , threads ) = self .__init_variables ()
@@ -131,10 +131,10 @@ def test_writer_priority(self):
131131 self .assertEqual ([1 ], threads [1 ].buffer_read )
132132 self .assertEqual ([1 , 2 ], threads [3 ].buffer_read )
133133 self .assertEqual ([1 , 2 ], threads [4 ].buffer_read )
134- self .assert_ (threads [0 ].exit_time < threads [1 ].entry_time )
135- self .assert_ (threads [1 ].exit_time <= threads [2 ].entry_time )
136- self .assert_ (threads [2 ].exit_time <= threads [3 ].entry_time )
137- self .assert_ (threads [2 ].exit_time <= threads [4 ].entry_time )
134+ self .assertTrue (threads [0 ].exit_time < threads [1 ].entry_time )
135+ self .assertTrue (threads [1 ].exit_time <= threads [2 ].entry_time )
136+ self .assertTrue (threads [2 ].exit_time <= threads [3 ].entry_time )
137+ self .assertTrue (threads [2 ].exit_time <= threads [4 ].entry_time )
138138
139139 def test_many_writers_priority (self ):
140140 (buffer_ , rw_lock , threads ) = self .__init_variables ()
@@ -154,13 +154,13 @@ def test_many_writers_priority(self):
154154 self .assertEqual ([1 ], threads [1 ].buffer_read )
155155 self .assertEqual ([1 , 2 , 3 ], threads [3 ].buffer_read )
156156 self .assertEqual ([1 , 2 , 3 ], threads [4 ].buffer_read )
157- self .assert_ (threads [0 ].exit_time < threads [1 ].entry_time )
158- self .assert_ (threads [1 ].exit_time <= threads [2 ].entry_time )
159- self .assert_ (threads [1 ].exit_time <= threads [5 ].entry_time )
160- self .assert_ (threads [2 ].exit_time <= threads [3 ].entry_time )
161- self .assert_ (threads [2 ].exit_time <= threads [4 ].entry_time )
162- self .assert_ (threads [5 ].exit_time <= threads [3 ].entry_time )
163- self .assert_ (threads [5 ].exit_time <= threads [4 ].entry_time )
157+ self .assertTrue (threads [0 ].exit_time < threads [1 ].entry_time )
158+ self .assertTrue (threads [1 ].exit_time <= threads [2 ].entry_time )
159+ self .assertTrue (threads [1 ].exit_time <= threads [5 ].entry_time )
160+ self .assertTrue (threads [2 ].exit_time <= threads [3 ].entry_time )
161+ self .assertTrue (threads [2 ].exit_time <= threads [4 ].entry_time )
162+ self .assertTrue (threads [5 ].exit_time <= threads [3 ].entry_time )
163+ self .assertTrue (threads [5 ].exit_time <= threads [4 ].entry_time )
164164
165165 @staticmethod
166166 def __init_variables ():
0 commit comments