summaryrefslogtreecommitdiff
path: root/tests/unittests/test_ec2_util.py
diff options
context:
space:
mode:
authorNate House nathan.house@rackspace.com <>2014-02-03 16:03:14 -0600
committerNate House nathan.house@rackspace.com <>2014-02-03 16:03:14 -0600
commita9e4009ae7221ea167b3e1083a887564483e0350 (patch)
treea370bd47399b1517c21b89d68aefd5afc15c5418 /tests/unittests/test_ec2_util.py
parent4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff)
parent3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff)
downloadvyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz
vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip
Fix merge conflict
Diffstat (limited to 'tests/unittests/test_ec2_util.py')
-rw-r--r--tests/unittests/test_ec2_util.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
index dd588aca..957dc3f2 100644
--- a/tests/unittests/test_ec2_util.py
+++ b/tests/unittests/test_ec2_util.py
@@ -34,6 +34,14 @@ class TestEc2Util(helpers.TestCase):
self.assertEquals('', userdata)
@hp.activate
+ def test_userdata_fetch_fail_server_not_found(self):
+ hp.register_uri(hp.GET,
+ 'http://169.254.169.254/%s/user-data' % (self.VERSION),
+ status=404)
+ userdata = eu.get_instance_userdata(self.VERSION)
+ self.assertEquals('', userdata)
+
+ @hp.activate
def test_metadata_fetch_no_keys(self):
base_url = 'http://169.254.169.254/%s/meta-data' % (self.VERSION)
hp.register_uri(hp.GET, base_url, status=200,