openstack/nova
Code Issues Proposed changes

Merge "Remove mox in unit/virt/xenapi/test_agent.py"

Browse Source
This commit is contained in:
Jenkins
2016-05-09 11:41:41 +00:00
committed by Gerrit Code Review
parent 74a8d820eb 5eef70678c
commit d15d94e70c
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
nova/tests/unit/virt/xenapi/test_agent.py
View File

@@ -124,26 +124,24 @@ class SkipFileInjectAtBootFlagTestCase(SysMetaKeyTestBase, AgentTestCaseBase):
class InjectSshTestCase(AgentTestCaseBase):
def test_inject_ssh_key_succeeds(self):
@mock.patch.object(agent.XenAPIBasedAgent, 'inject_file')
def test_inject_ssh_key_succeeds(self, mock_inject_file):
instance = _get_fake_instance()
agent = self._create_agent(instance)
self.mox.StubOutWithMock(agent, "inject_file")
agent.inject_file("/root/.ssh/authorized_keys",
"\n# The following ssh key was injected by Nova"
"\nssh-rsa asdf\n")
self.mox.ReplayAll()
agent.inject_ssh_key()
mock_inject_file.assert_called_once_with("/root/.ssh/authorized_keys",
"\n# The following ssh key "
"was injected by Nova"
"\nssh-rsa asdf\n")
def _test_inject_ssh_key_skipped(self, instance):
@mock.patch.object(agent.XenAPIBasedAgent, 'inject_file')
def _test_inject_ssh_key_skipped(self, instance, mock_inject_file):
agent = self._create_agent(instance)
# make sure its not called
self.mox.StubOutWithMock(agent, "inject_file")
self.mox.ReplayAll()
agent.inject_ssh_key()
mock_inject_file.assert_not_called()
def test_inject_ssh_key_skipped_no_key_data(self):
instance = _get_fake_instance()
@@ -162,45 +160,41 @@ class InjectSshTestCase(AgentTestCaseBase):
class FileInjectionTestCase(AgentTestCaseBase):
def test_inject_file(self):
@mock.patch.object(agent.XenAPIBasedAgent, '_call_agent')
def test_inject_file(self, mock_call_agent):
instance = _get_fake_instance()
agent = self._create_agent(instance)
self.mox.StubOutWithMock(agent, "_call_agent")
b64_path = base64.b64encode('path')
b64_contents = base64.b64encode('contents')
agent._call_agent('inject_file',
{'b64_contents': b64_contents,
'b64_path': b64_path})
self.mox.ReplayAll()
agent.inject_file("path", "contents")
mock_call_agent.assert_called_once_with('inject_file',
{'b64_contents': b64_contents,
'b64_path': b64_path})
def test_inject_files(self):
@mock.patch.object(agent.XenAPIBasedAgent, 'inject_file')
def test_inject_files(self, mock_inject_file):
instance = _get_fake_instance()
agent = self._create_agent(instance)
self.mox.StubOutWithMock(agent, "inject_file")
files = [("path1", "content1"), ("path2", "content2")]
agent.inject_file(*files[0])
agent.inject_file(*files[1])
self.mox.ReplayAll()
agent.inject_files(files)
mock_inject_file.assert_has_calls(
[mock.call("path1", "content1"), mock.call("path2", "content2")])
def test_inject_files_skipped_when_cloud_init_installed(self):
@mock.patch.object(agent.XenAPIBasedAgent, 'inject_file')
def test_inject_files_skipped_when_cloud_init_installed(self,
mock_inject_file):
instance = _get_fake_instance(
image_xenapi_skip_agent_inject_files_at_boot="True")
agent = self._create_agent(instance)
self.mox.StubOutWithMock(agent, "inject_file")
files = [("path1", "content1"), ("path2", "content2")]
self.mox.ReplayAll()
agent.inject_files(files)
mock_inject_file.assert_not_called()
class FakeRebootException(Exception):