X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e38ac44d14e9006c24c93bca9de1ee299b16d367..4d7567b7b3577b561dd064d397c10a9331c3ee16:/services/nodemanager/tests/testutil.py diff --git a/services/nodemanager/tests/testutil.py b/services/nodemanager/tests/testutil.py index 6e134375bb..ee475efe7e 100644 --- a/services/nodemanager/tests/testutil.py +++ b/services/nodemanager/tests/testutil.py @@ -55,7 +55,7 @@ def cloud_object_mock(name_id, **extra): def cloud_node_fqdn(node): # We intentionally put the FQDN somewhere goofy to make sure tested code is # using this function for lookups. - return node.extra.get('testname', 'NoTestName') + return node.extra.get('testname', node.name+'.NoTestName.invalid') def ip_address_mock(last_octet): return '10.20.30.{}'.format(last_octet) @@ -78,15 +78,17 @@ class MockShutdownTimer(object): class MockSize(object): - def __init__(self, factor): + def __init__(self, factor, preemptible=False): self.id = 'z{}.test'.format(factor) - self.name = self.id + self.name = 'test size '+self.id self.ram = 128 * factor self.disk = factor # GB self.scratch = 1000 * factor # MB self.bandwidth = 16 * factor self.price = float(factor) self.extra = {} + self.real = self + self.preemptible = preemptible def __eq__(self, other): return self.id == other.id