valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #29725 from cachedout/disable_moto

Browse Source 
Disable some boto tests per resolution of moto issue
This commit is contained in:
Mike Place 2015-12-15 14:59:59 -07:00
commit 1ad06593a2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/modules/boto_vpc_test.py
View File

@ -449,6 +449,7 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue(vpc_creation_result) self.assertTrue(vpc_creation_result)
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_that_when_creating_a_vpc_fails_the_create_vpc_method_returns_false(self): def test_that_when_creating_a_vpc_fails_the_create_vpc_method_returns_false(self):
''' '''
tests False VPC not created. tests False VPC not created.
@ -509,6 +510,7 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertFalse(describe_vpc['vpc']) self.assertFalse(describe_vpc['vpc'])
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_that_when_describing_vpc_by_id_on_connection_error_it_returns_error(self): def test_that_when_describing_vpc_by_id_on_connection_error_it_returns_error(self):
''' '''
Tests describing parameters failure Tests describing parameters failure
@ -614,6 +616,7 @@ class BotoVpcSubnetsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue(subnet_creation_result['created']) self.assertTrue(subnet_creation_result['created'])
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_that_when_creating_a_subnet_fails_the_create_subnet_method_returns_error(self): def test_that_when_creating_a_subnet_fails_the_create_subnet_method_returns_error(self):
''' '''
Tests creating a subnet failure Tests creating a subnet failure
@ -934,6 +937,7 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue(dhcp_options_creation_result['created']) self.assertTrue(dhcp_options_creation_result['created'])
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_that_when_creating_dhcp_options_fails_the_create_dhcp_options_method_returns_error(self): def test_that_when_creating_dhcp_options_fails_the_create_dhcp_options_method_returns_error(self):
''' '''
Tests creating dhcp options failure Tests creating dhcp options failure
@ -996,6 +1000,7 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue(dhcp_creation_and_association_result['created']) self.assertTrue(dhcp_creation_and_association_result['created'])
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_that_when_creating_and_associating_dhcp_options_set_to_an_existing_vpc_fails_creating_the_dhcp_options_the_associate_new_dhcp_options_method_raises_exception( def test_that_when_creating_and_associating_dhcp_options_set_to_an_existing_vpc_fails_creating_the_dhcp_options_the_associate_new_dhcp_options_method_raises_exception(
self): self):
''' '''
@ -1009,6 +1014,7 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue('error' in r) self.assertTrue('error' in r)
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_that_when_creating_and_associating_dhcp_options_set_to_an_existing_vpc_fails_associating_the_dhcp_options_the_associate_new_dhcp_options_method_raises_exception(self): def test_that_when_creating_and_associating_dhcp_options_set_to_an_existing_vpc_fails_associating_the_dhcp_options_the_associate_new_dhcp_options_method_raises_exception(self):
''' '''
Tests association failure during creation/association of dchp options to existing vpc Tests association failure during creation/association of dchp options to existing vpc

4
tests/unit/states/boto_vpc_test.py
View File

@ -118,6 +118,7 @@ class BotoVpcTestCase(BotoVpcStateTestCaseBase, BotoVpcTestCaseMixin):
self.assertEqual(vpc_present_result['changes'], {}) self.assertEqual(vpc_present_result['changes'], {})
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_present_with_failure(self): def test_present_with_failure(self):
with patch('moto.ec2.models.VPCBackend.create_vpc', side_effect=BotoServerError(400, 'Mocked error')): with patch('moto.ec2.models.VPCBackend.create_vpc', side_effect=BotoServerError(400, 'Mocked error')):
vpc_present_result = salt_states['boto_vpc.present']('test', cidr_block) vpc_present_result = salt_states['boto_vpc.present']('test', cidr_block)
@ -141,6 +142,7 @@ class BotoVpcTestCase(BotoVpcStateTestCaseBase, BotoVpcTestCaseMixin):
self.assertEqual(vpc_absent_result['changes']['new']['vpc'], None) self.assertEqual(vpc_absent_result['changes']['new']['vpc'], None)
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_absent_with_failure(self): def test_absent_with_failure(self):
vpc = self._create_vpc(name='test') vpc = self._create_vpc(name='test')
with patch('moto.ec2.models.VPCBackend.delete_vpc', side_effect=BotoServerError(400, 'Mocked error')): with patch('moto.ec2.models.VPCBackend.delete_vpc', side_effect=BotoServerError(400, 'Mocked error')):
@ -183,6 +185,7 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin):
self.assertEqual(resource_present_result['changes'], {}) self.assertEqual(resource_present_result['changes'], {})
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_present_with_failure(self): def test_present_with_failure(self):
vpc = self._create_vpc(name='test') vpc = self._create_vpc(name='test')
with patch('moto.ec2.models.{0}'.format(self.backend_create), side_effect=BotoServerError(400, 'Mocked error')): with patch('moto.ec2.models.{0}'.format(self.backend_create), side_effect=BotoServerError(400, 'Mocked error')):
@ -213,6 +216,7 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin):
self.assertFalse(exists) self.assertFalse(exists)
@mock_ec2 @mock_ec2
@skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
def test_absent_with_failure(self): def test_absent_with_failure(self):
vpc = self._create_vpc(name='test') vpc = self._create_vpc(name='test')
self._create_resource(vpc_id=vpc.id, name='test') self._create_resource(vpc_id=vpc.id, name='test')