Merge "Move rally.benchmark.runners.base module"

This commit is contained in:
Jenkins 2015-06-03 15:20:10 +00:00 committed by Gerrit Code Review
commit b0b2521cbd
2 changed files with 3 additions and 3 deletions
tests/unit/plugins/openstack/scenarios

@ -64,7 +64,7 @@ class GlanceImagesTestCase(test.TestCase):
@mock.patch(GLANCE_IMAGES + "._boot_servers")
@mock.patch(GLANCE_IMAGES + "._create_image")
@mock.patch("rally.benchmark.runners.base.osclients")
@mock.patch("rally.benchmark.runner.osclients")
def test_create_image_and_boot_instances(self,
mock_osclients,
mock_create_image,

@ -343,13 +343,13 @@ class NovaServersTestCase(test.TestCase):
@mock.patch("rally.plugins.openstack.scenarios"
".nova.servers.NovaServers.clients")
@mock.patch("rally.benchmark.runners.base.osclients")
@mock.patch("rally.benchmark.runner.osclients")
def test_boot_server_no_nics(self, mock_osclients, mock_nova_clients):
mock_nova_clients.return_value = fakes.FakeNovaClient()
self._verify_boot_server(mock_osclients=mock_osclients,
nic=None, assert_nic=False)
@mock.patch("rally.benchmark.runners.base.osclients")
@mock.patch("rally.benchmark.runner.osclients")
def test_boot_server_with_nic(self, mock_osclients):
self._verify_boot_server(mock_osclients=mock_osclients,
nic=[{"net-id": "net-1"}], assert_nic=True)