summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-28 19:17:07 +0000
committerGerrit Code Review <review@openstack.org>2012-02-28 19:17:07 +0000
commitd034c7838e2bb22a9451446e922eb67e78aba7b1 (patch)
tree88f091753d5644085eac2f755afe3ba15ef0b142 /nova/tests
parent9d6d72deb0b9241b924909e86ec9a54aacda4bf4 (diff)
parent6e6ef5589e8898f898b0d986db90e1e2356e889f (diff)
Merge "OS X Support fixed, bug 942352"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 843b48dd3..f0c285869 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -857,7 +857,7 @@ class TestLockCleanup(test.TestCase):
"""verify locks for dead processes are cleaned up"""
# create sentinels for two processes, us and a 'dead' one
- # no actve lock
+ # no active lock
sentinel1 = self._create_sentinel(self.hostname, self.pid)
sentinel2 = self._create_sentinel(self.hostname, self.dead_pid)