Commit 9df6d173 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Test “gnt-node volumes”.

Reviewed-by: iustinp
parent 61bf23ec
...@@ -441,6 +441,13 @@ def TestNodeInfo(): ...@@ -441,6 +441,13 @@ def TestNodeInfo():
cmd = ['gnt-node', 'info'] cmd = ['gnt-node', 'info']
AssertEqual(StartSSH(GetMasterNode()['primary'], AssertEqual(StartSSH(GetMasterNode()['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0) utils.ShellQuoteArgs(cmd)).wait(), 0)
def TestNodeVolumes():
"""gnt-node volumes"""
cmd = ['gnt-node', 'volumes']
AssertEqual(StartSSH(GetMasterNode()['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
# }}} # }}}
# {{{ Instance tests # {{{ Instance tests
...@@ -651,7 +658,6 @@ def TestUploadKnownHostsFile(localpath): ...@@ -651,7 +658,6 @@ def TestUploadKnownHostsFile(localpath):
AssertEqual(StartSSH(master['primary'], AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0) utils.ShellQuoteArgs(cmd)).wait(), 0)
raise raise
# }}} # }}}
# {{{ Main program # {{{ Main program
...@@ -732,6 +738,9 @@ if __name__ == '__main__': ...@@ -732,6 +738,9 @@ if __name__ == '__main__':
if TestEnabled('instance-consecutive-failures'): if TestEnabled('instance-consecutive-failures'):
RunTest(TestInstanceConsecutiveFailures, node, instance) RunTest(TestInstanceConsecutiveFailures, node, instance)
if TestEnabled('node-volumes'):
RunTest(TestNodeVolumes)
RunTest(TestInstanceRemove, instance) RunTest(TestInstanceRemove, instance)
del instance del instance
...@@ -743,6 +752,9 @@ if __name__ == '__main__': ...@@ -743,6 +752,9 @@ if __name__ == '__main__':
if TestEnabled('instance-info'): if TestEnabled('instance-info'):
RunTest(TestInstanceInfo, instance) RunTest(TestInstanceInfo, instance)
if TestEnabled('node-volumes'):
RunTest(TestNodeVolumes)
RunTest(TestInstanceRemove, instance) RunTest(TestInstanceRemove, instance)
del instance del instance
...@@ -759,6 +771,9 @@ if __name__ == '__main__': ...@@ -759,6 +771,9 @@ if __name__ == '__main__':
if TestEnabled('instance-failover'): if TestEnabled('instance-failover'):
RunTest(TestInstanceFailover, instance) RunTest(TestInstanceFailover, instance)
if TestEnabled('node-volumes'):
RunTest(TestNodeVolumes)
RunTest(TestInstanceRemove, instance) RunTest(TestInstanceRemove, instance)
del instance del instance
finally: finally:
......
...@@ -34,6 +34,7 @@ tests: ...@@ -34,6 +34,7 @@ tests:
cluster-destroy: True cluster-destroy: True
node-info: True node-info: True
node-volumes: True
instance-add-plain-disk: True instance-add-plain-disk: True
instance-add-local-mirror-disk: True instance-add-local-mirror-disk: True
......
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