Revision e1df06f2
b/qa/ganeti-qa.py | ||
---|---|---|
1 | 1 |
#!/usr/bin/python |
2 | 2 |
# |
3 | 3 |
|
4 |
# Copyright (C) 2007 Google Inc. |
|
4 |
# Copyright (C) 2007, 2008, 2009, 2010 Google Inc.
|
|
5 | 5 |
# |
6 | 6 |
# This program is free software; you can redistribute it and/or modify |
7 | 7 |
# it under the terms of the GNU General Public License as published by |
... | ... | |
145 | 145 |
RunTest(qa_os.TestOsPartiallyValid) |
146 | 146 |
RunTest(qa_os.TestOsModifyValid) |
147 | 147 |
RunTest(qa_os.TestOsModifyInvalid) |
148 |
RunTest(qa_os.TestOsStates) |
|
148 | 149 |
|
149 | 150 |
|
150 | 151 |
def RunCommonInstanceTests(instance): |
b/qa/qa_os.py | ||
---|---|---|
1 | 1 |
# |
2 | 2 |
# |
3 | 3 |
|
4 |
# Copyright (C) 2007 Google Inc. |
|
4 |
# Copyright (C) 2007, 2008, 2009, 2010 Google Inc.
|
|
5 | 5 |
# |
6 | 6 |
# This program is free software; you can redistribute it and/or modify |
7 | 7 |
# it under the terms of the GNU General Public License as published by |
... | ... | |
75 | 75 |
utils.ShellQuoteArgs(cmd)).wait(), expected_result) |
76 | 76 |
|
77 | 77 |
|
78 |
def _TestOsStates(): |
|
79 |
"""gnt-os modify, more stuff""" |
|
80 |
master = qa_config.GetMasterNode() |
|
81 |
|
|
82 |
cmd = ["gnt-os", "modify"] |
|
83 |
|
|
84 |
for param in ["hidden", "blacklisted"]: |
|
85 |
for val in ["yes", "no"]: |
|
86 |
new_cmd = cmd + ["--%s" % param, val, _TEMP_OS_NAME] |
|
87 |
AssertEqual(StartSSH(master["primary"], |
|
88 |
utils.ShellQuoteArgs(new_cmd)).wait(), 0) |
|
89 |
|
|
90 |
|
|
78 | 91 |
def _SetupTempOs(node, dir, valid): |
79 | 92 |
"""Creates a temporary OS definition on the given node. |
80 | 93 |
|
... | ... | |
181 | 194 |
} |
182 | 195 |
|
183 | 196 |
return _TestOsModify(hv_dict, 1) |
197 |
|
|
198 |
|
|
199 |
def TestOsStates(): |
|
200 |
"""Testing OS states""" |
|
201 |
|
|
202 |
return _TestOsStates() |
Also available in: Unified diff