Commit 502b3316 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Merge remote branch 'devel-2.4'


Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 4cc4d1fa bacae536
......@@ -710,8 +710,11 @@ class TestInstanceQuery(unittest.TestCase):
"inst6": {
"memory": 768,
},
"inst7": {
"vcpus": 3,
},
}
wrongnode_inst = set("inst2")
wrongnode_inst = set(["inst7"])
consinfo = dict((inst.name, None) for inst in instances)
consinfo["inst7"] = \
......@@ -830,7 +833,7 @@ class TestInstanceQuery(unittest.TestCase):
self.assertEqual(tested_status,
set(["ERROR_nodeoffline", "ERROR_nodedown",
"running", "ERROR_up", "ERROR_down",
"ADMIN_down"]))
"ADMIN_down", "ERROR_wrongnode"]))
def _CheckInstanceConsole(self, instance, (status, consdata)):
if instance.name == "inst7":
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment