From 7406212e2b61b068f3c077af4b69d905c07d6ab1 Mon Sep 17 00:00:00 2001 From: "sonu.kumar" Date: Wed, 18 May 2016 17:37:46 +0900 Subject: [PATCH] Remove test cases which are moved to designate_tempest_plugin Change-Id: I48e3ef586a1a8bd0ca733fe845922f209551e800 --- functionaltests/api/v2/test_recordset.py | 38 ------------ .../api/v2/test_zone_ownership_transfers.py | 58 ------------------- 2 files changed, 96 deletions(-) diff --git a/functionaltests/api/v2/test_recordset.py b/functionaltests/api/v2/test_recordset.py index 5116a0224..0798cc2e6 100644 --- a/functionaltests/api/v2/test_recordset.py +++ b/functionaltests/api/v2/test_recordset.py @@ -78,14 +78,6 @@ class RecordsetTest(DesignateV2Test): self.ensure_tld_exists('com') self.zone = self.useFixture(ZoneFixture()).created_zone - def test_list_recordsets(self): - post_model = datagen.random_a_recordset(self.zone.name) - self.useFixture(RecordsetFixture(self.zone.id, post_model)) - resp, model = RecordsetClient.as_user('default') \ - .list_recordsets(self.zone.id) - self.assertEqual(200, resp.status) - self.assertGreater(len(model.recordsets), 0) - def test_list_recordsets_with_filtering(self): # This test ensures the behavior in bug #1561746 won't happen post_model = datagen.random_a_recordset(self.zone.name, @@ -128,36 +120,6 @@ class RecordsetTest(DesignateV2Test): self.assertEqual(model_data, data) - @utils.parameterized(RECORDSETS_DATASET) - def test_crud_recordset(self, make_recordset): - post_model = make_recordset(self.zone) - fixture = self.useFixture(RecordsetFixture(self.zone.id, post_model)) - recordset_id = fixture.created_recordset.id - - self.assert_dns(fixture.post_model) - - put_model = make_recordset(self.zone) - del put_model.name # don't try to update the name - resp, put_resp_model = RecordsetClient.as_user('default') \ - .put_recordset(self.zone.id, recordset_id, put_model) - self.assertEqual(202, resp.status, "on put response") - self.assertEqual("PENDING", put_resp_model.status) - self.assertEqual(post_model.name, put_resp_model.name) - self.assertEqual(put_model.records, put_resp_model.records) - self.assertEqual(put_model.ttl, put_resp_model.ttl) - - RecordsetClient.as_user('default').wait_for_recordset( - self.zone.id, recordset_id) - - put_model.name = post_model.name - self.assert_dns(put_model) - - resp, delete_resp_model = RecordsetClient.as_user('default') \ - .delete_recordset(self.zone.id, recordset_id) - self.assertEqual(202, resp.status, "on delete response") - RecordsetClient.as_user('default').wait_for_404( - self.zone.id, recordset_id) - @utils.parameterized(WILDCARD_RECORDSETS_DATASET) def test_can_create_and_query_wildcard_recordset(self, make_recordset): post_model = make_recordset(self.zone) diff --git a/functionaltests/api/v2/test_zone_ownership_transfers.py b/functionaltests/api/v2/test_zone_ownership_transfers.py index f5827abe0..7335ace99 100644 --- a/functionaltests/api/v2/test_zone_ownership_transfers.py +++ b/functionaltests/api/v2/test_zone_ownership_transfers.py @@ -37,47 +37,6 @@ class TransferZoneOwnerShipTest(DesignateV2Test): self.ensure_tld_exists('com') self.zone = self.useFixture(ZoneFixture()).created_zone - def test_list_transfer_requests(self): - self.useFixture(TransferRequestFixture( - zone=self.zone, - post_model=datagen.random_transfer_request_data(), - )) - resp, model = TransferRequestClient.as_user('default') \ - .list_transfer_requests() - self.assertEqual(200, resp.status) - self.assertGreater(len(model.transfer_requests), 0) - - def test_create_zone_transfer_request(self): - fixture = self.useFixture(TransferRequestFixture( - zone=self.zone, - post_model=datagen.random_transfer_request_data(), - )) - self.assertEqual(201, fixture.post_resp.status) - self.assertEqual(self.zone.id, fixture.transfer_request.zone_id) - # todo: this fails. the zone_name is null in the POST's response, but - # it's filled in on a subsequent get - # self.assertEqual(self.zone.name, fixture.transfer_request.zone_name) - self.assertEqual(TransferRequestClient.as_user(fixture.user).tenant_id, - fixture.transfer_request.project_id) - self.assertIsNone(fixture.transfer_request.target_project_id) - - # check that the zone_name is filled in - resp, transfer_request = TransferRequestClient.as_user(fixture.user) \ - .get_transfer_request(fixture.transfer_request.id) - self.assertEqual(self.zone.name, transfer_request.zone_name) - - def test_view_zone_transfer_request(self): - fixture = self.useFixture(TransferRequestFixture( - zone=self.zone, - post_model=datagen.random_transfer_request_data(), - )) - - resp, transfer_request = TransferRequestClient.as_user('alt')\ - .get_transfer_request(fixture.transfer_request.id) - - self.assertEqual(resp.status, 200) - self.assertIsNone(getattr(transfer_request, 'key', None)) - def test_create_zone_transfer_request_scoped(self): target_project_id = TransferRequestClient.as_user('alt').tenant_id post_model = datagen.random_transfer_request_data( @@ -137,23 +96,6 @@ class TransferZoneOwnerShipTest(DesignateV2Test): self.addCleanup(TransferRequestFixture.cleanup_transfer_request, client, transfer_request.id) - def test_do_zone_transfer(self): - fixture = self.useFixture(TransferRequestFixture( - zone=self.zone, - post_model=datagen.random_transfer_request_data(), - user='default', - target_user='alt', - )) - transfer_request = fixture.transfer_request - - resp, transfer_accept = TransferAcceptClient.as_user('alt')\ - .post_transfer_accept( - datagen.random_transfer_accept_data( - key=transfer_request.key, - zone_transfer_request_id=transfer_request.id - )) - self.assertEqual(201, resp.status) - def test_do_zone_transfer_scoped(self): target_project_id = TransferRequestClient.as_user('alt').tenant_id post_model = datagen.random_transfer_request_data(