diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-28 17:31:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-28 17:31:01 +0000 |
| commit | 571556954aab97da593c8afb463bc3fe27458414 (patch) | |
| tree | d5a12edcf41a1716a14138950caa29c969c8e47e | |
| parent | 18bc8abd031f294c69941bd0401738b664f14bf0 (diff) | |
| parent | 8ba5f9d72d9ab8618c57548d202ea81c8b5f8a19 (diff) | |
| download | nova-571556954aab97da593c8afb463bc3fe27458414.tar.gz nova-571556954aab97da593c8afb463bc3fe27458414.tar.xz nova-571556954aab97da593c8afb463bc3fe27458414.zip | |
Merge "Use flags() helper method to override config in tests"
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index e86c334b1..d82dd3154 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -613,7 +613,7 @@ class ServersActionsJsonTest(ServersSampleBase): 'server-action-rebuild-resp') def test_server_resize(self): - CONF.allow_resize_to_same_host = True + self.flags(allow_resize_to_same_host=True) uuid = self._post_server() self._test_server_action(uuid, "resize", {"id": 2, @@ -1157,7 +1157,7 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase): def test_cloud_pipe_create(self): """Get api samples of cloud pipe extension creation""" - CONF.vpn_image_id = fake.get_valid_image_id() + self.flags(vpn_image_id=fake.get_valid_image_id()) project = {'project_id': 'cloudpipe-' + str(uuid.uuid4())} response = self._do_post('os-cloudpipe', 'cloud-pipe-create-req', project) |