projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnt-instance: Adding instance policy to failover
[ganeti-local]
/
qa
/
qa_daemon.py
diff --git
a/qa/qa_daemon.py
b/qa/qa_daemon.py
index
e50fe79
..
6b0ce93
100644
(file)
--- a/
qa/qa_daemon.py
+++ b/
qa/qa_daemon.py
@@
-65,14
+65,17
@@
def _ResetWatcherDaemon():
"""Removes the watcher daemon's state file.
"""
"""Removes the watcher daemon's state file.
"""
- AssertCommand(["rm", "-f", constants.WATCHER_STATEFILE])
+ AssertCommand([
+ "bash", "-c",
+ "rm -vf %s" % (constants.WATCHER_GROUP_STATE_FILE % "*-*-*-*")
+ ])
def _RunWatcherDaemon():
"""Runs the ganeti-watcher daemon on the master node.
"""
def _RunWatcherDaemon():
"""Runs the ganeti-watcher daemon on the master node.
"""
- AssertCommand(["ganeti-watcher", "-d", "--ignore-pause"])
+ AssertCommand(["ganeti-watcher", "-d", "--ignore-pause", "--wait-children"])
def TestPauseWatcher():
def TestPauseWatcher():