Merge lp:~rackspace-titan/nova/test_004_metadata_retry into lp:~hudson-openstack/nova/trunk

[Dan Prince]

Update the curl command in the __public_instance_is_accessible function of test_netadmin to return an error code which we can then check for and handle properly. This should allow calling functions to properly retry and timeout if an actual test failure happens.

[William Wolf (throughnothing)]

looks good

review: Approve

[Alex Meade (alex-meade)]

What does adding -f do?

[Alex Meade (alex-meade)]

nvm, spose I skipped over it in the man pages

[Dan Prince (dan-prince)]

> What does adding -f do?

Without using -f curl returns an exit status of 0 when an HTTP 4xx error occurs (which typically means the command ran successfully). Using the -f option makes curl a bit more script friendly... From the curl man page:

       -f/--fail
              (HTTP) Fail silently (no output at all) on server errors. This
              is mostly done to better enable scripts etc to better deal with
              failed attempts. In normal cases when a HTTP server fails to
              deliver a document, it returns an HTML document stating so
              (which often also describes why and more). This flag will pre‐
              vent curl from outputting that and return error 22.

              This method is not fail-safe and there are occasions where non-
              successful response codes will slip through, especially when
              authentication is involved (response codes 401 and 407).

[John Tran (jtran)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Brian Waldon (bcwaldon)]

lgtm

review: Approve

=== modified file 'smoketests/test_netadmin.py'
--- smoketests/test_netadmin.py	2011-08-05 15:17:05 +0000
+++ smoketests/test_netadmin.py	2011-08-07 03:07:21 +0000
@@ -109,9 +109,12 @@
 
     def __public_instance_is_accessible(self):
         id_url = "latest/meta-data/instance-id"
-        options = "-s --max-time 1"
+        options = "-f -s --max-time 1"
         command = "curl %s %s/%s" % (options, self.data['public_ip'], id_url)
-        instance_id = commands.getoutput(command).strip()
+        status, output = commands.getstatusoutput(command)
+        instance_id = output.strip()
+        if status > 0:
+            return False
         if not instance_id:
             return False
         if instance_id != self.data['instance'].id: