diff options
Diffstat (limited to 'python/test/Ice/acm/TestI.py')
| -rw-r--r-- | python/test/Ice/acm/TestI.py | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/python/test/Ice/acm/TestI.py b/python/test/Ice/acm/TestI.py index a728dfce1b3..a54e13621bb 100644 --- a/python/test/Ice/acm/TestI.py +++ b/python/test/Ice/acm/TestI.py @@ -56,26 +56,17 @@ class TestIntfI(Test.TestIntf): self.m = threading.Condition() def sleep(self, delay, current=None): - self.m.acquire() - try: + with self.m: self.m.wait(delay) - finally: - self.m.release() def sleepAndHold(self, delay, current=None): - self.m.acquire() - try: + with self.m: current.adapter.hold() self.m.wait(delay) - finally: - self.m.release() def interruptSleep(self, delay, current=None): - self.m.acquire() - try: + with self.m: self.m.notifyAll() - finally: - self.m.release() def waitForHeartbeat(self, count, current=None): @@ -86,21 +77,15 @@ class TestIntfI(Test.TestIntf): self.count = 0 def heartbeat(self, con): - self.m.acquire() - try: + with self.m: self.count -= 1 self.m.notifyAll() - finally: - self.m.release() def waitForCount(self, count): - self.m.acquire() - self.count = count - try: + with self.m: + self.count = count while self.count > 0: self.m.wait() - finally: - self.m.release() callback = ConnectionCallbackI() current.con.setHeartbeatCallback(lambda con: callback.heartbeat(con)) |