From ae475a0bc955d4f66a1686980dd92fb42028cfce Mon Sep 17 00:00:00 2001
From: Rajiv Bakulesh Shah <brainix@gmail.com>
Date: Sun, 7 Jan 2018 21:12:13 -0800
Subject: [PATCH] Combine context managers into same line / `with`
This syntax is simpler than nesting context managers.
---
tests/test_redlock.py | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/tests/test_redlock.py b/tests/test_redlock.py
index b6089a2a..b769e0f3 100644
--- a/tests/test_redlock.py
+++ b/tests/test_redlock.py
@@ -141,11 +141,10 @@ def test_context_manager(self):
def test_context_manager_time_out_before_exit(self):
assert not self.redis.exists(self.redlock.key)
- with self.assertRaises(ReleaseUnlockedLock):
- with self.redlock:
- assert self.redis.exists(self.redlock.key)
- time.sleep(self.redlock.auto_release_time / 1000 + 1)
- assert not self.redis.exists(self.redlock.key)
+ with self.assertRaises(ReleaseUnlockedLock), self.redlock:
+ assert self.redis.exists(self.redlock.key)
+ time.sleep(self.redlock.auto_release_time / 1000 + 1)
+ assert not self.redis.exists(self.redlock.key)
assert not self.redis.exists(self.redlock.key)
def test_context_manager_acquired(self):
@@ -160,23 +159,21 @@ def test_context_manager_acquired(self):
def test_context_manager_acquired_time_out_before_exit(self):
assert not self.redis.exists(self.redlock.key)
assert not self.redlock.locked()
- with self.assertRaises(ReleaseUnlockedLock):
- with self.redlock:
- assert self.redis.exists(self.redlock.key)
- assert self.redlock.locked()
- time.sleep(self.redlock.auto_release_time / 1000 + 1)
- assert not self.redis.exists(self.redlock.key)
- assert not self.redlock.locked()
+ with self.assertRaises(ReleaseUnlockedLock), self.redlock:
+ assert self.redis.exists(self.redlock.key)
+ assert self.redlock.locked()
+ time.sleep(self.redlock.auto_release_time / 1000 + 1)
+ assert not self.redis.exists(self.redlock.key)
+ assert not self.redlock.locked()
assert not self.redis.exists(self.redlock.key)
assert not self.redlock.locked()
def test_context_manager_release_before_exit(self):
assert not self.redis.exists(self.redlock.key)
- with self.assertRaises(ReleaseUnlockedLock):
- with self.redlock:
- assert self.redis.exists(self.redlock.key)
- self.redlock.release()
- assert not self.redis.exists(self.redlock.key)
+ with self.assertRaises(ReleaseUnlockedLock), self.redlock:
+ assert self.redis.exists(self.redlock.key)
+ self.redlock.release()
+ assert not self.redis.exists(self.redlock.key)
def test_repr(self):
assert repr(self.redlock) == '<Redlock key=redlock:printer value=None timeout=0>'