diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-07-25 23:11:17 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-07-25 23:11:17 +0000 |
commit | 9072290b22732f29152cca1bff54c7a0af5643f7 (patch) | |
tree | d516b8a57c17bf802454c0b546df8ae7b8ef1dd7 /nova/tests | |
parent | 8b6ef639f94200b1c54b12beec115dc19f953da3 (diff) | |
parent | 974417b75f5f839ce4daaf080147ad154d727f10 (diff) | |
download | nova-9072290b22732f29152cca1bff54c7a0af5643f7.tar.gz nova-9072290b22732f29152cca1bff54c7a0af5643f7.tar.xz nova-9072290b22732f29152cca1bff54c7a0af5643f7.zip |
Merge "Fix wrong regex in cleanup_file_locks."
Diffstat (limited to 'nova/tests')
-rw-r--r-- | nova/tests/test_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index 24c2e04fb..eb7fce1e0 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -606,7 +606,7 @@ class TestLockCleanup(test.TestCase): def _get_sentinel_name(self, hostname, pid, thread='MainThread'): return os.path.join(FLAGS.lock_path, - '%s.%s-%d' % (hostname, thread, pid)) + '%s-%s.%d' % (hostname, thread, pid)) def _create_sentinel(self, hostname, pid, thread='MainThread'): name = self._get_sentinel_name(hostname, pid, thread) |