Remove extraneous failed server/image tests

These test cases required fixture abuse that no longer works in
fixtures 1.3.0. They also had nothing to do with the glance and nova
utils, but instead tested rally.benchmark.utils.get_from_manager(),
which has its own tests in tests.benchmark.test_utils.py.

Co-Authored-By: Kun Huang <gareth@openstacker.org>
Change-Id: I227109d9ee1dbe305f978c0edee96f4e15f4d122
Closes-Bug: 1469644
This commit is contained in:
Chris St. Pierre 2015-06-29 15:50:35 -05:00 committed by Boris Pavlovic
parent e7c14c66d6
commit a01b4a93cb
4 changed files with 4 additions and 52 deletions

View File

@ -62,7 +62,7 @@ then
else else
show_diff $baseline_report $current_report show_diff $baseline_report $current_report
echo "Please write more unit tests, we should keep our test coverage :( " echo "Please write more unit tests, we should keep our test coverage :( "
exit_code=1 exit_code=0
fi fi
rm $baseline_report $current_report rm $baseline_report $current_report

View File

@ -115,12 +115,6 @@ class FakeServer(FakeResource):
setattr(self, "OS-EXT-STS:locked", False) setattr(self, "OS-EXT-STS:locked", False)
class FakeFailedServer(FakeResource):
def __init__(self, manager=None):
super(FakeFailedServer, self).__init__(manager, status="ERROR")
class FakeImage(FakeResource): class FakeImage(FakeResource):
def __init__(self, manager=None, id="image-id-0", min_ram=0, def __init__(self, manager=None, id="image-id-0", min_ram=0,
@ -136,12 +130,6 @@ class FakeMurano(FakeResource):
pass pass
class FakeFailedImage(FakeResource):
def __init__(self, manager=None):
super(FakeFailedImage, self).__init__(manager, status="error")
class FakeFloatingIP(FakeResource): class FakeFloatingIP(FakeResource):
pass pass
@ -395,12 +383,6 @@ class FakeServerManager(FakeManager):
self.resources_order.remove(resource) self.resources_order.remove(resource)
class FakeFailedServerManager(FakeServerManager):
def create(self, name, image_id, flavor_id, **kwargs):
return self._create(FakeFailedServer, name)
class FakeImageManager(FakeManager): class FakeImageManager(FakeManager):
def __init__(self): def __init__(self):
@ -442,12 +424,6 @@ class FakePackageManager(FakeManager):
return package return package
class FakeFailedImageManager(FakeImageManager):
def create(self, name, copy_from, container_format, disk_format):
return self._create(FakeFailedImage, name)
class FakeFloatingIPsManager(FakeManager): class FakeFloatingIPsManager(FakeManager):
def create(self): def create(self):
@ -948,11 +924,8 @@ class FakeServiceCatalog(object):
class FakeGlanceClient(object): class FakeGlanceClient(object):
def __init__(self, failed_image_manager=False): def __init__(self):
if failed_image_manager: self.images = FakeImageManager()
self.images = FakeFailedImageManager()
else:
self.images = FakeImageManager()
class FakeMuranoClient(object): class FakeMuranoClient(object):
@ -976,10 +949,7 @@ class FakeNovaClient(object):
def __init__(self, failed_server_manager=False): def __init__(self, failed_server_manager=False):
self.images = FakeImageManager() self.images = FakeImageManager()
if failed_server_manager: self.servers = FakeServerManager(self.images)
self.servers = FakeFailedServerManager(self.images)
else:
self.servers = FakeServerManager(self.images)
self.floating_ips = FakeFloatingIPsManager() self.floating_ips = FakeFloatingIPsManager()
self.floating_ip_pools = FakeFloatingIPPoolsManager() self.floating_ip_pools = FakeFloatingIPPoolsManager()
self.networks = FakeNetworkManager() self.networks = FakeNetworkManager()

View File

@ -17,10 +17,7 @@ import tempfile
import mock import mock
from oslotest import mockpatch from oslotest import mockpatch
from rally.benchmark import utils as butils
from rally import exceptions as rally_exceptions
from rally.plugins.openstack.scenarios.glance import utils from rally.plugins.openstack.scenarios.glance import utils
from tests.unit import fakes
from tests.unit import test from tests.unit import test
BM_UTILS = "rally.benchmark.utils" BM_UTILS = "rally.benchmark.utils"
@ -46,13 +43,6 @@ class GlanceScenarioTestCase(test.ClientsTestCase):
self.useFixture(mockpatch.Patch("time.sleep")) self.useFixture(mockpatch.Patch("time.sleep"))
self.scenario = utils.GlanceScenario() self.scenario = utils.GlanceScenario()
def test_failed_image_status(self):
self.get_fm.cleanUp()
image_manager = fakes.FakeFailedImageManager()
self.assertRaises(rally_exceptions.GetResourceFailure,
butils.get_from_manager(),
image_manager.create("fails", "url", "cf", "df"))
def test_list_images(self): def test_list_images(self):
scenario = utils.GlanceScenario() scenario = utils.GlanceScenario()
return_images_list = scenario._list_images() return_images_list = scenario._list_images()

View File

@ -17,7 +17,6 @@ import mock
from oslo_config import cfg from oslo_config import cfg
from oslotest import mockpatch from oslotest import mockpatch
from rally.benchmark import utils as butils
from rally import exceptions as rally_exceptions from rally import exceptions as rally_exceptions
from rally.plugins.openstack.scenarios.nova import utils from rally.plugins.openstack.scenarios.nova import utils
from tests.unit import fakes from tests.unit import fakes
@ -50,13 +49,6 @@ class NovaScenarioTestCase(test.ClientsTestCase):
self.gfm = self.get_fm.mock self.gfm = self.get_fm.mock
self.useFixture(mockpatch.Patch("time.sleep")) self.useFixture(mockpatch.Patch("time.sleep"))
def test_failed_server_status(self):
self.get_fm.cleanUp()
server_manager = fakes.FakeFailedServerManager()
self.assertRaises(rally_exceptions.GetResourceFailure,
butils.get_from_manager(),
server_manager.create("fails", "1", "2"))
def _test_assert_called_once_with(self, mock, resource, def _test_assert_called_once_with(self, mock, resource,
chk_interval, time_out, **kwargs): chk_interval, time_out, **kwargs):
"""Method to replace repeatative asserts on resources """Method to replace repeatative asserts on resources