openstack
/
magnum
Code Issues Proposed changes

Fix pod tests in kube handler 

Closes-Bug: #1437977
Change-Id: Ia67e8ad8dfe4350a8008eccc46d19dca2a3ea75b
This commit is contained in:
Kennan 2015-03-30 22:00:55 +08:00
parent c98d33c794
commit 6980a2d3aa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/conductor/handlers/kube.py
View File

@ -142,7 +142,7 @@ class Handler(object):
# - extract pod labels and set it
# TODO(yuanying): Should kube_utils support definition_url?
# When do we get pod labels and name?
pod.create()
pod.create(context)
return pod
def pod_update(self, context, pod):

6
magnum/tests/conductor/handlers/test_kube.py
View File

@ -130,8 +130,9 @@ class TestKube(base.TestCase):
with patch.object(self.kube_handler, 'kube_cli') as mock_kube_cli:
mock_kube_cli.pod_create.return_value = True
self.kube_handler.pod_create({}, expected_pod)
self.kube_handler.pod_create(self.context, expected_pod)
self.assertEqual('pending', expected_pod.status)
expected_pod.create.assert_called_once_with(self.context)
@patch('magnum.conductor.handlers.kube._retrieve_k8s_master_url')
def test_pod_create_with_fail(self,
@ -144,8 +145,9 @@ class TestKube(base.TestCase):
with patch.object(self.kube_handler, 'kube_cli') as mock_kube_cli:
mock_kube_cli.pod_create.return_value = False
self.kube_handler.pod_create({}, expected_pod)
self.kube_handler.pod_create(self.context, expected_pod)
self.assertEqual('failed', expected_pod.status)
expected_pod.create.assert_called_once_with(self.context)
@patch('magnum.conductor.handlers.kube._object_has_stack')
@patch('magnum.conductor.handlers.kube._retrieve_k8s_master_url')