Merge pull request #1066 from kgaillot/1.1

Testing fixes
ClusterLabs · Jun 15, 2016 · e928f0b · e928f0b
2 parents 7130937 + 0fa6262
commit e928f0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cts/patterns.py b/cts/patterns.py
@@ -60,8 +60,8 @@ def __init__(self, name):
             "Pat:Fencing_ok"    : r"stonith.*:\s*Operation .* of %s by .* for .*@.*: OK",
             "Pat:Fencing_recover"    : r"pengine.*: Recover %s",
 
-            "Pat:RscOpOK"       : r"crmd.*:\s+Result of %s operation for %s.*: ok",
-            "Pat:RscRemoteOpOK" : r"crmd.*:\s+Result of %s operation for %s on %s: ok",
+            "Pat:RscOpOK"       : r"crmd.*:\s+Result of %s operation for %s.*: (0 \()?ok",
+            "Pat:RscRemoteOpOK" : r"crmd.*:\s+Result of %s operation for %s on %s: (0 \()?ok",
             "Pat:NodeFenced"    : r"crmd.*:\s*Peer\s+%s\s+was\s+terminated\s+\(.*\)\s+by\s+.*\s+for\s+.*:\s+OK",
             "Pat:FenceOpOK"     : "Operation .* for host '%s' with device .* returned: 0",
         }
@@ -387,7 +387,7 @@ def __init__(self, name):
             r"crit:.*Fencing daemon connection failed",
             r"error:.*Sign-in failed: triggered a retry",
             "STONITH connection failed, finalizing .* pending operations.",
-            r"crmd.*:\s+Result of .* operation for Fencing.* Error",
+            r"crmd.*:\s+Result of .* operation for Fencing.*Error",
         ]
         self.components["stonith-ignore"].extend(self.components["common-ignore"])
 

diff --git a/extra/resources/Dummy b/extra/resources/Dummy
@@ -157,15 +157,15 @@ dummy_start() {
 
     RETVAL=$?
     if [ $RETVAL -eq $OCF_SUCCESS ]; then
-        if [ "$(hostname)" = "${OCF_RESKEY_fail_start_on}" ]; then
+        if [ "$(uname -n)" = "${OCF_RESKEY_fail_start_on}" ]; then
             RETVAL=$OCF_ERR_GENERIC
         fi
         return $RETVAL
     fi
 
     touch "${OCF_RESKEY_state}"
     RETVAL=$?
-    if [ "$(hostname)" = "${OCF_RESKEY_fail_start_on}" ]; then
+    if [ "$(uname -n)" = "${OCF_RESKEY_fail_start_on}" ]; then
         RETVAL=$OCF_ERR_GENERIC
     fi
     return $RETVAL