diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-22 16:52:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-22 16:52:23 +0000 |
| commit | 3e91e6d123cc737aebc80d2e7b413183bbc6828e (patch) | |
| tree | 287034081443afd436e0a22472a23762716d67d3 | |
| parent | 4abf480c7ec61e8906ec96da8f78dec336584f98 (diff) | |
| parent | 88d316f0be89d8fe1cc5616091e0ceb47abfd55f (diff) | |
| download | oslo-3e91e6d123cc737aebc80d2e7b413183bbc6828e.tar.gz oslo-3e91e6d123cc737aebc80d2e7b413183bbc6828e.tar.xz oslo-3e91e6d123cc737aebc80d2e7b413183bbc6828e.zip | |
Merge "Locking edge case when lock_path does not exist"
| -rw-r--r-- | openstack/common/lockutils.py | 1 | ||||
| -rw-r--r-- | tests/unit/test_lockutils.py | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/openstack/common/lockutils.py b/openstack/common/lockutils.py index 00becb0..ef42b9b 100644 --- a/openstack/common/lockutils.py +++ b/openstack/common/lockutils.py @@ -207,7 +207,6 @@ def synchronized(name, lock_file_prefix, external=False, lock_path=None): local_lock_path = tempfile.mkdtemp() if not os.path.exists(local_lock_path): - cleanup_dir = True fileutils.ensure_tree(local_lock_path) # NOTE(mikal): the lock name cannot contain directory diff --git a/tests/unit/test_lockutils.py b/tests/unit/test_lockutils.py index ae5dca7..1230569 100644 --- a/tests/unit/test_lockutils.py +++ b/tests/unit/test_lockutils.py @@ -186,8 +186,6 @@ class LockTestCase(utils.BaseTestCase): shutil.rmtree(lock_dir, ignore_errors=True) def test_synchronized_externally_lock_dir_not_exist(self): - self.skipTest('bug #1107950') - lock_dir = tempfile.mkdtemp() os.rmdir(lock_dir) self.config(lock_path=lock_dir) |