From: Steven Hardy Date: Tue, 3 Sep 2013 23:05:42 +0000 (+0100) Subject: Change _testnoexisthost_ references in tests X-Git-Tag: 2014.1~78^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7f3c7c690ee1968304b239486419d17dcd0bdbc8;p=openstack-build%2Fheat-build.git 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 --- diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py index df05c8f8..63a4d7c0 100644 --- a/heat/tests/test_autoscaling.py +++ b/heat/tests/test_autoscaling.py @@ -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): diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py index a7fb4c7b..2a892fb3 100644 --- a/heat/tests/test_ceilometer_alarm.py +++ b/heat/tests/test_ceilometer_alarm.py @@ -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() diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py index 77755a4e..e9399364 100644 --- a/heat/tests/test_heatclient.py +++ b/heat/tests/test_heatclient.py @@ -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) diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index 528729c4..919a06a7 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -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): diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index 5221ca9d..01ace312 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -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 diff --git a/heat/tests/test_nova_utils.py b/heat/tests/test_nova_utils.py index e9b0e299..6c9f04c0 100644 --- a/heat/tests/test_nova_utils.py +++ b/heat/tests/test_nova_utils.py @@ -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() diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py index cdd49072..fb249dff 100644 --- a/heat/tests/test_s3.py +++ b/heat/tests/test_s3.py @@ -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')) diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py index 5cbbf9cb..364ecf25 100644 --- a/heat/tests/test_signal.py +++ b/heat/tests/test_signal.py @@ -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() diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py index 1efb525d..00099a35 100644 --- a/heat/tests/test_sqlalchemy_api.py +++ b/heat/tests/test_sqlalchemy_api.py @@ -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')) diff --git a/heat/tests/test_swift.py b/heat/tests/test_swift.py index 879ac910..3adc19d2 100644 --- a/heat/tests/test_swift.py +++ b/heat/tests/test_swift.py @@ -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')) diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py index b599e111..db1a3ce6 100644 --- a/heat/tests/test_waitcondition.py +++ b/heat/tests/test_waitcondition.py @@ -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()) diff --git a/heat/tests/utils.py b/heat/tests/utils.py index f5b0c2c2..234fdb35 100644 --- a/heat/tests/utils.py +++ b/heat/tests/utils.py @@ -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' })