Revision e8ae0c20 qa/qa_utils.py
| b/qa/qa_utils.py | ||
|---|---|---|
| 61 | 61 |
_SetupColours() |
| 62 | 62 |
|
| 63 | 63 |
|
| 64 |
def AssertEqual(first, second, msg=None):
|
|
| 64 |
def AssertEqual(first, second): |
|
| 65 | 65 |
"""Raises an error when values aren't equal. |
| 66 | 66 |
|
| 67 | 67 |
""" |
| 68 | 68 |
if not first == second: |
| 69 |
raise qa_error.Error(msg or '%r == %r' % (first, second)) |
|
| 69 |
raise qa_error.Error('%r == %r' % (first, second))
|
|
| 70 |
|
|
| 71 |
|
|
| 72 |
def AssertNotEqual(first, second): |
|
| 73 |
"""Raises an error when values are equal. |
|
| 74 |
|
|
| 75 |
""" |
|
| 76 |
if not first != second: |
|
| 77 |
raise qa_error.Error('%r != %r' % (first, second))
|
|
| 70 | 78 |
|
| 71 | 79 |
|
| 72 | 80 |
def GetSSHCommand(node, cmd, strict=True): |
| ... | ... | |
| 158 | 166 |
"""Gets the full name of an instance. |
| 159 | 167 |
|
| 160 | 168 |
""" |
| 161 |
return _ResolveName(['gnt-instance', 'info', instance['info']],
|
|
| 169 |
return _ResolveName(['gnt-instance', 'info', instance['name']],
|
|
| 162 | 170 |
'Instance name') |
| 163 | 171 |
|
| 164 | 172 |
|
Also available in: Unified diff