projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 5493-getting-started-modal
[arvados.git]
/
services
/
nodemanager
/
tests
/
test_computenode_driver_ec2.py
diff --git
a/services/nodemanager/tests/test_computenode_driver_ec2.py
b/services/nodemanager/tests/test_computenode_driver_ec2.py
index 8e528247bda3bb3147ec66f154fb4cbe07093f61..d28a2a6441baedeebe4ebeec6f6861d580146cc5 100644
(file)
--- a/
services/nodemanager/tests/test_computenode_driver_ec2.py
+++ b/
services/nodemanager/tests/test_computenode_driver_ec2.py
@@
-34,7
+34,7
@@
class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase):
list_method = self.driver_mock().list_images
list_method.return_value = [testutil.cloud_object_mock(c)
for c in 'abc']
list_method = self.driver_mock().list_images
list_method.return_value = [testutil.cloud_object_mock(c)
for c in 'abc']
- driver = self.new_driver(create_kwargs={'image_id': 'b'})
+ driver = self.new_driver(create_kwargs={'image_id': '
id_
b'})
self.assertEqual(1, list_method.call_count)
def test_create_includes_ping_secret(self):
self.assertEqual(1, list_method.call_count)
def test_create_includes_ping_secret(self):
@@
-91,6
+91,12
@@
class EC2ComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase):
reftuple)}
self.assertEqual(refsecs, ec2.ComputeNodeDriver.node_start_time(node))
reftuple)}
self.assertEqual(refsecs, ec2.ComputeNodeDriver.node_start_time(node))
+ def test_node_fqdn(self):
+ name = 'fqdntest.zzzzz.arvadosapi.com'
+ node = testutil.cloud_node_mock()
+ node.name = name
+ self.assertEqual(name, ec2.ComputeNodeDriver.node_fqdn(node))
+
def test_cloud_exceptions(self):
for error in [Exception("test exception"),
IOError("test exception"),
def test_cloud_exceptions(self):
for error in [Exception("test exception"),
IOError("test exception"),