7478: Test fixes.
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 30 May 2018 21:08:34 +0000 (18:08 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 30 May 2018 21:08:34 +0000 (18:08 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

services/nodemanager/arvnodeman/test/fake_driver.py
services/nodemanager/tests/test_computenode_driver.py
services/nodemanager/tests/test_computenode_driver_ec2.py
services/nodemanager/tests/test_config.py
services/nodemanager/tests/testutil.py

index 5d033081213c5faa72dc33c656dd9c3167f140da..978c6aa908e3fb6feeedf81b8f053aaa82852f73 100644 (file)
@@ -49,7 +49,7 @@ class FakeDriver(NodeDriver):
             ping_url = re.search(r"echo '(.*)' > /var/tmp/arv-node-data/arv-ping-url", ex_customdata).groups(1)[0]
         if ex_userdata:
             ping_url = ex_userdata
-        if ex_metadata:
+        elif ex_metadata:
             ping_url = ex_metadata["arv-ping-url"]
         ping_url += "&instance_id=" + nodeid
         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
index 128a29e28d24ba4d5f3f8aae1bc535c9c60af043..4bf4c39efbc45ea069ea91ca3c0e94108d9b248b 100644 (file)
@@ -80,7 +80,7 @@ class ComputeNodeDriverTestCase(unittest.TestCase):
         for an_error, is_cloud_error in errors:
             self.driver_mock().create_node.side_effect = an_error
             with self.assertRaises(an_error):
-                driver.create_node('1', 'id_1')
+                driver.create_node(testutil.MockSize(1), 'id_1')
             if is_cloud_error:
                 error_count += 1
             self.assertEqual(error_count, status.tracker.get('create_node_errors'))
index 297eac0ef3baade9abcca3691009628f6c3647c2..ed0e0bd21ad7351084d8856542bb7c30d5d9c928 100644 (file)
@@ -56,9 +56,11 @@ class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase):
         driver.create_node(testutil.MockSize(1), arv_node)
         create_method = self.driver_mock().create_node
         self.assertTrue(create_method.called)
-        self.assertEqual(
-            {'test':'testvalue'},
-            create_method.call_args[1].get('ex_metadata', {'arg': 'missing'})
+        self.assertIn(
+            ('test', 'testvalue'),
+            create_method.call_args[1].get(
+                'ex_metadata',
+                {'arg': 'missing'}).items()
         )
 
     def test_hostname_from_arvados_node(self):
index 921281bc517bd7b6bc41935193c0b8562395a6da..15716d5277e502c52df55cc034f49078ff148b6d 100644 (file)
@@ -53,8 +53,7 @@ testlogger = INFO
 
     def test_list_sizes(self):
         config = self.load_config()
-        client = config.new_cloud_client()
-        sizes = config.node_sizes(client.list_sizes())
+        sizes = config.node_sizes()
         self.assertEqual(1, len(sizes))
         size, kwargs = sizes[0]
         self.assertEqual('Small', size.name)
index 555144c4d05d2bc562d9bc2357fa93421f64b35f..857e09f06e52eb2c5096b0d08783137230de48b9 100644 (file)
@@ -87,6 +87,8 @@ class MockSize(object):
         self.bandwidth = 16 * factor
         self.price = float(factor)
         self.extra = {}
+        self.real = self
+        self.preemptable = False
 
     def __eq__(self, other):
         return self.id == other.id