summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-05 06:53:37 +0000
committerGerrit Code Review <review@openstack.org>2013-01-05 06:53:37 +0000
commitef0ff2f51ad769b3c9f60a4fc7d3e7eb7b0ae305 (patch)
treead0286163d87c8a4831eb55dfd217a4fad894121 /nova/tests
parentd150f8a799cce1ced542375987d040f643f86344 (diff)
parent5ee157c428b09b102906a7ec6834985557369b20 (diff)
Merge "Add ping to conductor"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/conductor/test_conductor.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index f919b0465..86f47a79c 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -339,6 +339,10 @@ class _BaseTestCase(object):
{'uuid': 'fake-id'}, 'fake-refr',
'fake-bool')
+ def test_ping(self):
+ result = self.conductor.ping(self.context, 'foo')
+ self.assertEqual(result, {'service': 'conductor', 'arg': 'foo'})
+
class ConductorTestCase(_BaseTestCase, test.TestCase):
"""Conductor Manager Tests"""