12538: Refactor crunch-run shutdown

[arvados.git] / services / nodemanager / arvnodeman / test / fake_driver.py

diff --git a/services/nodemanager/arvnodeman/test/fake_driver.py b/services/nodemanager/arvnodeman/test/fake_driver.py
index a34e3668457a3fad961bce90c0f816bc037fbd46..c8558a417a2979a56ee69501cf3491737f4b987e 100644 (file)
--- a/services/nodemanager/arvnodeman/test/fake_driver.py
+++ b/services/nodemanager/arvnodeman/test/fake_driver.py
@@ -11,7 +11,7 @@ from arvnodeman.computenode import ARVADOS_TIMEFMT
 
 from libcloud.compute.base import NodeSize, Node, NodeDriver, NodeState, NodeImage
 from libcloud.compute.drivers.gce import GCEDiskType
-from libcloud.common.exceptions import BaseHTTPError
+from libcloud.common.exceptions import BaseHTTPError, RateLimitReachedError
 
 all_nodes = []
 create_calls = 0
@@ -129,8 +129,11 @@ class RetryDriver(FakeDriver):
         global create_calls
         create_calls += 1
         if create_calls < 2:
+            raise RateLimitReachedError(429, "Rate limit exceeded",
+                                        retry_after=12)
+        elif create_calls < 3:
             raise BaseHTTPError(429, "Rate limit exceeded",
-                                {'retry-after': '12'})
+                                {'retry-after': '2'})
         else:
             return super(RetryDriver, self).create_node(name=name,
                     size=size,
@@ -150,11 +153,13 @@ class FakeAwsDriver(FakeDriver):
                     image=None,
                     auth=None,
                     ex_userdata=None,
+                    ex_metadata=None,
                     ex_blockdevicemappings=None):
         n = super(FakeAwsDriver, self).create_node(name=name,
                                                       size=size,
                                                       image=image,
                                                       auth=auth,
+                                                      ex_metadata=ex_metadata,
                                                       ex_userdata=ex_userdata)
         n.extra = {"launch_time": time.strftime(ARVADOS_TIMEFMT, time.gmtime())[:-1]}
         return n