Merge "Remove tests moved to tempest"

This commit is contained in:
Jenkins 2016-04-21 18:42:48 +00:00 committed by Gerrit Code Review
commit deaff20d76

View File

@ -14,11 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from tempest_lib.exceptions import Conflict
from tempest_lib.exceptions import Forbidden
from tempest_lib.exceptions import NotFound
from functionaltests.common import datagen
from functionaltests.api.v2.base import DesignateV2Test
from functionaltests.api.v2.clients.recordset_client import RecordsetClient
from functionaltests.api.v2.clients.zone_client import ZoneClient
@ -30,82 +27,6 @@ from functionaltests.api.v2.fixtures import ZoneExportFixture
from functionaltests.common.models import ZoneFileRecord
class ZoneTest(DesignateV2Test):
def setUp(self):
super(ZoneTest, self).setUp()
self.increase_quotas(user='default')
self.ensure_tld_exists('com')
self.fixture = self.useFixture(ZoneFixture(user='default'))
def test_list_zones(self):
resp, model = ZoneClient.as_user('default').list_zones()
self.assertEqual(200, resp.status)
self.assertGreater(len(model.zones), 0)
def test_create_zone(self):
self.assertEqual(202, self.fixture.post_resp.status)
def test_update_zone(self):
old_model = self.fixture.created_zone
patch_model = datagen.random_zone_data()
del patch_model.name # don't try to override the zone name
resp, new_model = ZoneClient.as_user('default').patch_zone(
old_model.id, patch_model)
self.assertEqual(202, resp.status)
ZoneClient.as_user('default').wait_for_zone(new_model.id)
resp, model = ZoneClient.as_user('default').get_zone(new_model.id)
self.assertEqual(200, resp.status)
self.assertEqual(old_model.id, new_model.id)
self.assertEqual(old_model.name, new_model.name)
self.assertEqual(patch_model.ttl, new_model.ttl)
self.assertEqual(patch_model.email, new_model.email)
def test_delete_zone(self):
client = ZoneClient.as_user('default')
resp, model = client.delete_zone(self.fixture.created_zone.id)
self.assertEqual(202, resp.status)
client.wait_for_zone_404(model.id)
def test_list_zones_dot_json_fails(self):
self.assertRaises(NotFound,
lambda: ZoneClient.as_user('default').zones_dot_json())
class ZoneOwnershipTest(DesignateV2Test):
def setup(self):
super(ZoneTest, self).setUp()
self.increase_quotas(user='default')
self.increase_quotas(user='alt')
self.ensure_tld_exists('com')
def test_no_create_duplicate_domain(self):
post_model = self.useFixture(ZoneFixture(user='default')).post_model
self.assertRaises(Conflict,
lambda: ZoneClient.as_user('default').post_zone(post_model))
self.assertRaises(Conflict,
lambda: ZoneClient.as_user('alt').post_zone(post_model))
def test_no_create_subdomain_by_alt_user(self):
zone = self.useFixture(ZoneFixture(user='default')).post_model
subzone = datagen.random_zone_data(name='sub.' + zone.name)
subsubzone = datagen.random_zone_data(name='sub.sub.' + zone.name)
self.assertRaises(Forbidden,
lambda: ZoneClient.as_user('alt').post_zone(subzone))
self.assertRaises(Forbidden,
lambda: ZoneClient.as_user('alt').post_zone(subsubzone))
def test_no_create_superdomain_by_alt_user(self):
superzone = datagen.random_zone_data()
zone = datagen.random_zone_data(name="a.b." + superzone.name)
self.useFixture(ZoneFixture(zone, user='default'))
self.assertRaises(Forbidden,
lambda: ZoneClient.as_user('alt').post_zone(superzone))
class ZoneImportTest(DesignateV2Test):
def setUp(self):