diff --git a/designate/tests/test_api/test_v2/test_import_export.py b/designate/tests/test_api/test_v2/test_import_export.py index 2c1db36c9..40f4e977f 100644 --- a/designate/tests/test_api/test_v2/test_import_export.py +++ b/designate/tests/test_api/test_v2/test_import_export.py @@ -11,6 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +import unittest + import six from dns import zone as dnszone from webtest import TestApp @@ -149,6 +151,7 @@ class APIV2ZoneImportExportTest(ApiV2TestCase): self.assertIn('metadata', response.json) self.assertIn('total_count', response.json['metadata']) + @unittest.skip("See bug 1582241 and 1570859") def test_total_count_imports(self): response = self.client.get('/zones/tasks/imports') diff --git a/designate/tests/test_api/test_v2/test_pools.py b/designate/tests/test_api/test_v2/test_pools.py index 7eeaebcea..a422ea6fb 100644 --- a/designate/tests/test_api/test_v2/test_pools.py +++ b/designate/tests/test_api/test_v2/test_pools.py @@ -12,8 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import unittest - import six from oslo_config import cfg from oslo_log import log as logging @@ -39,7 +37,6 @@ class ApiV2PoolsTest(ApiV2TestCase): # Override to policy to make everyone an admin. self.policy({'admin': '@'}) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool(self): # Prepare a Pool fixture fixture = self.get_pool_fixture(fixture=0) @@ -68,7 +65,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self.assertEqual( fixture['ns_records'], response.json['ns_records']) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_validation(self): # NOTE: The schemas should be tested separatly to the API. So we # don't need to test every variation via the API itself. @@ -95,7 +91,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_name_missing(self): fixture = self.get_pool_fixture(fixture=0) fixture['attributes'] = self.get_pool_attribute_fixture(fixture=0) @@ -104,7 +99,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_name_too_long(self): fixture = self.get_pool_fixture(fixture=0) fixture['attributes'] = self.get_pool_attribute_fixture(fixture=0) @@ -113,7 +107,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_description_too_long(self): fixture = self.get_pool_fixture(fixture=0) fixture['attributes'] = self.get_pool_attribute_fixture(fixture=0) @@ -122,7 +115,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_provisioner_too_long(self): fixture = self.get_pool_fixture(fixture=0) fixture['attributes'] = self.get_pool_attribute_fixture(fixture=0) @@ -131,7 +123,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_tenant_id_too_long(self): fixture = self.get_pool_fixture(fixture=0) fixture['attributes'] = self.get_pool_attribute_fixture(fixture=0) @@ -140,7 +131,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_create_pool_duplicate(self): # Prepare a Pool fixture fixture = self.get_pool_fixture(fixture=0) @@ -155,7 +145,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception('duplicate_pool', 409, self.client.post_json, '/pools', body) - @unittest.skip("Flakey Test, See bug 1570859") def test_get_pools(self): response = self.client.get('/pools') @@ -185,7 +174,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_paging(data, '/pools', key='pools') self._assert_invalid_paging(data, '/pools', key='pools') - @unittest.skip("Flakey Test, See bug 1570859") def test_get_pools_filter(self): fixtures = [self.get_pool_fixture(fixture=0), self.get_pool_fixture(fixture=1)] @@ -213,13 +201,11 @@ class ApiV2PoolsTest(ApiV2TestCase): # Check that the correct number of pools match self.assertEqual(correct_result, len(response.json['pools'])) - @unittest.skip("Flakey Test, See bug 1570859") def test_get_pools_invalid_filter(self): invalid_url = '/pools?description=test' self._assert_exception( 'bad_request', 400, self.client.get, invalid_url) - @unittest.skip("Flakey Test, See bug 1570859") def test_get_pool(self): # Create a pool pool = self.create_pool() @@ -256,7 +242,6 @@ class ApiV2PoolsTest(ApiV2TestCase): [n.hostname for n in pool['ns_records']], [n['hostname'] for n in response.json['ns_records']]) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool(self): # Create a pool pool = self.create_pool() @@ -295,7 +280,6 @@ class ApiV2PoolsTest(ApiV2TestCase): [n.hostname for n in pool['ns_records']], [n['hostname'] for n in response.json['ns_records']]) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool_ns_records(self): # Create a pool pool = self.create_pool() @@ -323,7 +307,6 @@ class ApiV2PoolsTest(ApiV2TestCase): [n['hostname'] for n in response.json['ns_records']]) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool_ns_records_without_priority(self): pool = self.create_pool() body = {'ns_records': [ @@ -336,7 +319,6 @@ class ApiV2PoolsTest(ApiV2TestCase): errmsg = response.json['errors']['errors'][0]['message'] self.assertEqual("'priority' is a required property", errmsg) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool_attributes(self): # Create a pool pool = self.create_pool() @@ -356,7 +338,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self.assertEqual('private', response.json['attributes']['scope']) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool_name_too_long(self): pool = self.create_pool() body = {"attributes": {"scope": "private"}} @@ -365,7 +346,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.patch_json, url, body) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool_description_too_long(self): pool = self.create_pool() body = {"attributes": {"scope": "private"}} @@ -374,7 +354,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.patch_json, url, body) - @unittest.skip("Flakey Test, See bug 1570859") def test_update_pool_provisioner_too_long(self): pool = self.create_pool() body = {"attributes": {"scope": "private"}} @@ -383,7 +362,6 @@ class ApiV2PoolsTest(ApiV2TestCase): self._assert_exception( 'invalid_object', 400, self.client.patch_json, url, body) - @unittest.skip("Flakey Test, See bug 1570859") def test_delete_pool(self): pool = self.create_pool() url = '/pools/%s' % pool['id']