diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-10-09 17:11:05 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-10-09 17:11:05 +0000 |
commit | 7f4a3bd01650f0fac8eb2a454e4b36affd8f3b46 (patch) | |
tree | 455849f2670352598ee25afae607a3b0e4b494bf | |
parent | 8f74ad2b153fabce16239d4920c9c9cc6655134b (diff) | |
parent | 10faffc95617a98661d01d114cc3dc2d2ae2dbe6 (diff) | |
download | oslo-concurrency-7f4a3bd01650f0fac8eb2a454e4b36affd8f3b46.tar.gz |
Merge "Make lock_wrapper private"
-rw-r--r-- | oslo/concurrency/lockutils.py | 4 | ||||
-rw-r--r-- | tests/unit/test_lockutils.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oslo/concurrency/lockutils.py b/oslo/concurrency/lockutils.py index b8781ab..bd08fb1 100644 --- a/oslo/concurrency/lockutils.py +++ b/oslo/concurrency/lockutils.py @@ -333,7 +333,7 @@ def synchronized_with_prefix(lock_file_prefix): return functools.partial(synchronized, lock_file_prefix=lock_file_prefix) -def lock_wrapper(argv): +def _lock_wrapper(argv): """Create a dir for locks and pass it to command from arguments This is exposed as a console script entry point named @@ -357,4 +357,4 @@ def lock_wrapper(argv): def main(): - sys.exit(lock_wrapper(sys.argv)) + sys.exit(_lock_wrapper(sys.argv)) diff --git a/tests/unit/test_lockutils.py b/tests/unit/test_lockutils.py index 188eef1..0709f75 100644 --- a/tests/unit/test_lockutils.py +++ b/tests/unit/test_lockutils.py @@ -495,7 +495,7 @@ class LockutilsModuleTestCase(test_base.BaseTestCase): 'assert os.path.isdir(lock_path)', ]) argv = ['', sys.executable, '-c', script] - retval = lockutils.lock_wrapper(argv) + retval = lockutils._lock_wrapper(argv) self.assertEqual(retval, 0, "Bad OSLO_LOCK_PATH has been set") def test_return_value_maintained(self): @@ -504,7 +504,7 @@ class LockutilsModuleTestCase(test_base.BaseTestCase): 'sys.exit(1)', ]) argv = ['', sys.executable, '-c', script] - retval = lockutils.lock_wrapper(argv) + retval = lockutils._lock_wrapper(argv) self.assertEqual(retval, 1) |