openstack
/
heat
Code Issues Proposed changes

Change _testnoexisthost_ references in tests 

These dummy urls are obviously invalid, but could potentially trigger
unexpected failures due to the underscores.

Instead use RFC2606's recommended test TLD of '.test' ensures
that these will never resolve.

Change-Id: I2723b18ef3eba81ee8c8a22d866ceb79c00aad75
This commit is contained in:
Steven Hardy 2013-09-04 00:05:42 +01:00
parent e686699b00
commit 7f3c7c690e
12 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/tests/test_autoscaling.py
View File

@ -108,7 +108,7 @@ class AutoScalingTest(HeatTestCase):
super(AutoScalingTest, self).setUp()
utils.setup_dummy_db()
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
def create_scaling_group(self, t, stack, resource_name):

2
heat/tests/test_ceilometer_alarm.py
View File

@ -92,7 +92,7 @@ class CeilometerAlarmTest(HeatTestCase):
generic_resource.SignalResource)
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
self.fa = FakeCeilometerClient()

12
heat/tests/test_heatclient.py
View File

@ -33,7 +33,7 @@ class KeystoneClientTest(HeatTestCase):
# Import auth_token to have keystone_authtoken settings setup.
importutils.import_module('keystoneclient.middleware.auth_token')
dummy_url = 'http://_testnoexisthost_:5000/v2.0'
dummy_url = 'http://server.test:5000/v2.0'
cfg.CONF.set_override('auth_uri', dummy_url,
group='keystone_authtoken')
cfg.CONF.set_override('admin_user', 'heat',
@ -77,22 +77,22 @@ class KeystoneClientTest(HeatTestCase):
if method == 'token':
self.mock_ks_v3_client = heat_keystoneclient.kc_v3.Client(
token='abcd1234', project_name='test_tenant',
auth_url='http://_testnoexisthost_:5000/v3',
endpoint='http://_testnoexisthost_:5000/v3')
auth_url='http://server.test:5000/v3',
endpoint='http://server.test:5000/v3')
elif method == 'password':
self.mock_ks_v3_client = heat_keystoneclient.kc_v3.Client(
username='test_username',
password='password',
project_name='test_tenant',
project_id='test_tenant_id',
auth_url='http://_testnoexisthost_:5000/v3',
endpoint='http://_testnoexisthost_:5000/v3')
auth_url='http://server.test:5000/v3',
endpoint='http://server.test:5000/v3')
elif method == 'trust':
self.mock_ks_v3_client = heat_keystoneclient.kc_v3.Client(
username='heat',
password='verybadpass',
project_name='service',
auth_url='http://_testnoexisthost_:5000/v3',
auth_url='http://server.test:5000/v3',
trust_id='atrust123')
self.mock_ks_v3_client.authenticate().AndReturn(auth_ok)

2
heat/tests/test_loadbalancer.py
View File

@ -110,7 +110,7 @@ class LoadBalancerTest(HeatTestCase):
username='test_stack.CfnLBUser')
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
utils.setup_dummy_db()
def create_loadbalancer(self, t, stack, resource_name):

2
heat/tests/test_metadata_refresh.py
View File

@ -195,7 +195,7 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
self.fc = fakes.FakeKeystoneClient()
self.man = service.EngineService('a-host', 'a-topic')
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
# Note tests creating a stack should be decorated with @stack_delete_after
# to ensure the stack is properly cleaned up

8
heat/tests/test_nova_utils.py
View File

@ -89,8 +89,8 @@ class NovaUtilsTests(HeatTestCase):
self.m.StubOutWithMock(nova_utils.cfg, 'CONF')
cnf = nova_utils.cfg.CONF
cnf.instance_user = 'testuser'
cnf.heat_metadata_server_url = 'http://_testnoexisthost_:123'
cnf.heat_watch_server_url = 'http://_testnoexisthost_:345'
cnf.heat_metadata_server_url = 'http://server.test:123'
cnf.heat_watch_server_url = 'http://server.test:345'
cnf.instance_connection_is_secure = False
cnf.instance_connection_https_validate_certificates = False
self.m.ReplayAll()
@ -100,8 +100,8 @@ class NovaUtilsTests(HeatTestCase):
self.assertTrue("Content-Type: text/part-handler;" in data)
self.assertTrue("Content-Type: text/x-cfninitdata;" in data)
self.assertTrue("Content-Type: text/x-shellscript;" in data)
self.assertTrue("http://_testnoexisthost_:345" in data)
self.assertTrue("http://_testnoexisthost_:123" in data)
self.assertTrue("http://server.test:345" in data)
self.assertTrue("http://server.test:123" in data)
self.assertTrue("[Boto]" in data)
self.assertTrue('testuser' in data)
self.m.VerifyAll()

6
heat/tests/test_s3.py
View File

@ -91,7 +91,7 @@ class s3Test(HeatTestCase):
'X-Container-Read': 'test_tenant:test_username'}
).AndReturn(None)
swiftclient.Connection.get_auth().MultipleTimes().AndReturn(
('http://_testnoexisthost_:8080/v_2', None))
('http://server.test:8080/v_2', None))
swiftclient.Connection.delete_container(container_name).AndReturn(None)
self.m.ReplayAll()
@ -102,8 +102,8 @@ class s3Test(HeatTestCase):
ref_id = rsrc.FnGetRefId()
self.assertEqual(container_name, ref_id)
self.assertEqual('_testnoexisthost_', rsrc.FnGetAtt('DomainName'))
url = 'http://_testnoexisthost_:8080/v_2/%s' % ref_id
self.assertEqual('server.test', rsrc.FnGetAtt('DomainName'))
url = 'http://server.test:8080/v_2/%s' % ref_id
self.assertEqual(url, rsrc.FnGetAtt('WebsiteURL'))

6
heat/tests/test_signal.py
View File

@ -57,7 +57,7 @@ class SignalTest(HeatTestCase):
generic_resource.GenericResource)
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
self.stack_id = 'STACKABCD1234'
self.fc = fakes.FakeKeystoneClient()
@ -102,7 +102,7 @@ class SignalTest(HeatTestCase):
self.assertEqual(rsrc.state, (rsrc.CREATE, rsrc.COMPLETE))
expected_url = "".join([
'http://_testnoexisthost_:8000/v1/signal/',
'http://server.test:8000/v1/signal/',
'arn%3Aopenstack%3Aheat%3A%3Atest_tenant%3Astacks%2F',
'test_stack%2FSTACKABCD1234%2Fresources%2F',
'signal_handler?',
@ -111,7 +111,7 @@ class SignalTest(HeatTestCase):
'AWSAccessKeyId=4567&',
'SignatureVersion=2&',
'Signature=',
'dPUzYOioXbSUJjdl9C%2FXtw1VLfAnJf7uj69ZJ%2BiGNv0%3D'])
'VW4NyvRO4WhQdsQ4rxl5JMUr0AlefHN6OLsRz9oZyls%3D'])
self.assertEqual(expected_url, rsrc.FnGetAtt('AlarmUrl'))
self.m.VerifyAll()

2
heat/tests/test_sqlalchemy_api.py
View File

@ -274,7 +274,7 @@ class SqlAlchemyTest(HeatTestCase):
self.assertIsNotNone(load_creds.get('created_at'))
self.assertIsNone(load_creds.get('updated_at'))
self.assertEqual(load_creds.get('auth_url'),
'http://_testnoexisthost_:5000/v2.0')
'http://server.test:5000/v2.0')
self.assertIsNone(load_creds.get('trust_id'))
self.assertIsNone(load_creds.get('trustor_user_id'))

6
heat/tests/test_swift.py
View File

@ -130,7 +130,7 @@ class swiftTest(HeatTestCase):
'X-Container-Read': None}
).AndReturn(None)
swiftclient.Connection.get_auth().MultipleTimes().AndReturn(
('http://_testnoexisthost_:8080/v_2', None))
('http://server.test:8080/v_2', None))
swiftclient.Connection.head_container(
mox.IgnoreArg()).MultipleTimes().AndReturn(headers)
swiftclient.Connection.delete_container(container_name).AndReturn(None)
@ -143,8 +143,8 @@ class swiftTest(HeatTestCase):
ref_id = rsrc.FnGetRefId()
self.assertEqual(container_name, ref_id)
self.assertEqual('_testnoexisthost_', rsrc.FnGetAtt('DomainName'))
url = 'http://_testnoexisthost_:8080/v_2/%s' % ref_id
self.assertEqual('server.test', rsrc.FnGetAtt('DomainName'))
url = 'http://server.test:8080/v_2/%s' % ref_id
self.assertEqual(url, rsrc.FnGetAtt('WebsiteURL'))
self.assertEqual('82', rsrc.FnGetAtt('ObjectCount'))

18
heat/tests/test_waitcondition.py
View File

@ -84,7 +84,7 @@ class WaitConditionTest(HeatTestCase):
'get_status')
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
@ -278,7 +278,7 @@ class WaitConditionTest(HeatTestCase):
stack_id = 'STACK_HUBSID_1234'
t = json.loads(test_template_waitcondition)
badhandle = ("http://_testnoexisthost_:8000/v1/waitcondition/" +
badhandle = ("http://server.test:8000/v1/waitcondition/" +
"arn%3Aopenstack%3Aheat%3A%3Atest_tenant" +
"%3Astacks%2Ftest_stack%2F" +
"bad1" +
@ -299,7 +299,7 @@ class WaitConditionTest(HeatTestCase):
stack_id = 'STACKABCD1234'
t = json.loads(test_template_waitcondition)
badhandle = ("http://_testnoexisthost_:8000/v1/waitcondition/" +
badhandle = ("http://server.test:8000/v1/waitcondition/" +
"arn%3Aopenstack%3Aheat%3A%3Atest_tenant" +
"%3Astacks%2FBAD_stack%2F" +
stack_id + "%2Fresources%2FWaitHandle")
@ -318,7 +318,7 @@ class WaitConditionTest(HeatTestCase):
stack_id = 'STACKABCD1234'
t = json.loads(test_template_waitcondition)
badhandle = ("http://_testnoexisthost_:8000/v1/waitcondition/" +
badhandle = ("http://server.test:8000/v1/waitcondition/" +
"arn%3Aopenstack%3Aheat%3A%3ABAD_tenant" +
"%3Astacks%2Ftest_stack%2F" +
stack_id + "%2Fresources%2FWaitHandle")
@ -337,7 +337,7 @@ class WaitConditionTest(HeatTestCase):
stack_id = 'STACK_HUBR_1234'
t = json.loads(test_template_waitcondition)
badhandle = ("http://_testnoexisthost_:8000/v1/waitcondition/" +
badhandle = ("http://server.test:8000/v1/waitcondition/" +
"arn%3Aopenstack%3Aheat%3A%3Atest_tenant" +
"%3Astacks%2Ftest_stack%2F" +
stack_id + "%2Fresources%2FBADHandle")
@ -355,7 +355,7 @@ class WaitConditionTest(HeatTestCase):
self.m.ReplayAll()
stack_id = 'STACKABCD1234'
t = json.loads(test_template_waitcondition)
badhandle = ("http://_testnoexisthost_:8000/v1/waitcondition/" +
badhandle = ("http://server.test:8000/v1/waitcondition/" +
"arn%3Aopenstack%3Aheat%3A%3Atest_tenant" +
"%3Astacks%2Ftest_stack%2F" +
stack_id + "%2Fresources%2FWaitForTheHandle")
@ -373,7 +373,7 @@ class WaitConditionHandleTest(HeatTestCase):
def setUp(self):
super(WaitConditionHandleTest, self).setUp()
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://_testnoexisthost_:8000/v1/waitcondition')
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
utils.setup_dummy_db()
@ -432,7 +432,7 @@ class WaitConditionHandleTest(HeatTestCase):
self.assertEqual(rsrc.state, (rsrc.CREATE, rsrc.COMPLETE))
expected_url = "".join([
'http://_testnoexisthost_:8000/v1/waitcondition/',
'http://server.test:8000/v1/waitcondition/',
'arn%3Aopenstack%3Aheat%3A%3Atest_tenant%3Astacks%2F',
'test_stack2%2F', stack_id, '%2Fresources%2F',
'WaitHandle?',
@ -441,7 +441,7 @@ class WaitConditionHandleTest(HeatTestCase):
'AWSAccessKeyId=4567&',
'SignatureVersion=2&',
'Signature=',
'dGH5JuZW9mOQ%2Fs3aun7vm5ATj0YemC7C8zCHOeG6Fbs%3D'])
'fHyt3XFnHq8%2FSwYaVcHdJka1hz6jdK5mHtgbo8OOKbQ%3D'])
self.assertEqual(unicode(expected_url), rsrc.FnGetRefId())

2
heat/tests/utils.py
View File

@ -137,7 +137,7 @@ def dummy_context(user='test_username', tenant_id='test_tenant_id',
'password': password,
'roles': roles,
'trust_id': 'atrust123',
'auth_url': 'http://_testnoexisthost_:5000/v2.0',
'auth_url': 'http://server.test:5000/v2.0',
'auth_token': 'abcd1234'
})