From b8281fdd345158397c27ab39e6fad6345d14365d Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 20 Jan 2016 14:25:01 -0800
Subject: [PATCH] Retry in case of ephemeral errors

---
 tests/letstest/multitester.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/letstest/multitester.py b/tests/letstest/multitester.py
index dee6968c3..19a6aad1a 100644
--- a/tests/letstest/multitester.py
+++ b/tests/letstest/multitester.py
@@ -139,7 +139,15 @@ def make_instance(instance_name,
     time.sleep(1.0)
 
     # give instance a name
-    new_instance.create_tags(Tags=[{'Key': 'Name', 'Value': instance_name}])
+    try:
+        new_instance.create_tags(Tags=[{'Key': 'Name', 'Value': instance_name}])
+    except botocore.exceptions.ClientError, e:
+        if "InvalidInstanceID.NotFound" in str(e):
+            # This seems to be ephemeral... retry
+            time.sleep(1)
+            new_instance.create_tags(Tags=[{'Key': 'Name', 'Value': instance_name}])
+        else:
+            raise
     return new_instance
 
 def terminate_and_clean(instances):