Merge "functional: Remove 'get_invalid_image'"

This commit is contained in:
Zuul 2019-12-12 13:17:03 +00:00 committed by Gerrit Code Review
commit 66ffed4586
2 changed files with 1 additions and 5 deletions

View File

@ -25,7 +25,6 @@ import time
import os_traits
from oslo_log import log as logging
from oslo_utils.fixture import uuidsentinel as uuids
from nova.compute import instance_actions
from nova.compute import utils as compute_utils
@ -317,9 +316,6 @@ class _IntegratedTestBase(test.TestCase):
return (generate_new_element(flavor_names, 'flavor'),
int(generate_new_element(flavor_ids, '', True)))
def get_invalid_image(self):
return uuids.fake
def _build_minimal_create_server_request(self, name=None, image_uuid=None,
flavor_id=None, networks=None,
az=None, host=None):

View File

@ -266,7 +266,7 @@ class ServersTest(ServersTestBase):
self.api.post_server, post)
# With an invalid imageRef, this throws 500.
server[self._image_ref_parameter] = self.get_invalid_image()
server[self._image_ref_parameter] = uuids.fake
# TODO(justinsb): Check whatever the spec says should be thrown here
self.assertRaises(client.OpenStackApiException,
self.api.post_server, post)