openstack
/
magnum-tempest-plugin
Code Issues Proposed changes

Merge "Fix gate issues with functional-api job"

This commit is contained in:
Jenkins 2016-02-08 22:28:11 +00:00 committed by Gerrit Code Review
parent ba20642833 c6b5c0eb01
commit 317db96a82
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
magnum/tests/functional/api/v1/test_bay.py
View File

@ -106,7 +106,8 @@ class BayTest(base.BaseMagnumTest):
# they time out on the gate (2 hours not enough)
@testtools.testcase.attr('positive')
def test_create_list_and_delete_bays(self):
gen_model = datagen.valid_bay_data(baymodel_id=self.baymodel.uuid)
gen_model = datagen.valid_bay_data(
baymodel_id=self.baymodel.uuid, node_count=1)
_, temp_model = self._create_bay(gen_model)
resp, model = self.bay_client.list_bays()
self.assertEqual(resp.status, 200)
@ -139,24 +140,6 @@ class BayTest(base.BaseMagnumTest):
exceptions.BadRequest,
self.bay_client.post_bay, gen_model)
@testtools.testcase.attr('negative')
def test_update_bay_baymodel_name_for_existing_bay(self):
first_model = datagen.valid_bay_data(baymodel_id=self.baymodel.uuid,
name='test')
_, old_model = self._create_bay(first_model)
patch_model = datagen.bay_name_patch_data()
self.assertRaises(
exceptions.BadRequest,
self.bay_client.patch_bay,
old_model.uuid, patch_model)
patch_baymodel = datagen.baymodel_name_patch_data()
self.assertRaises(
exceptions.BadRequest,
self.baymodel_client.patch_baymodel,
self.baymodel.uuid, patch_baymodel)
@testtools.testcase.attr('negative')
def test_update_bay_for_nonexisting_bay(self):
patch_model = datagen.bay_name_patch_data()