make tests pass

reconquest · May 30, 2016 · c0097fd · c0097fd
1 parent b50bb12
commit c0097fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -108,7 +108,7 @@ Advanced options:
                           behavior.
     --no-preserve-uid    Do not preserve UIDs for transferred files.
     --no-preserve-gid    Do not preserve GIDs for transferred files.
-    --post-action <exe>  Run specified post-action tool on each remote node.
+    --sync-tool <tool>   Run specified post-action tool on each remote node.
                           Post-action tool should accept followin arguments:
                           * string prefix, that should be used to prefix all
                           stdout and stderr from the process; all unprefixed
@@ -121,8 +121,8 @@ Advanced options:
     -g --args <args>     Arguments to pass untouched to the post-action tool.
                           No modification will be done to the passed arg, so
                           take care about escaping.
-    -m --simple <exe>    Treat post-action as simple tool, which is not
-                          support specified protocol messages. No syncc
+    -r --run-tool <exe>  Treat post-action as simple tool, which is not
+                          support specified protocol messages. No sync
                           is possible in that case and all stdout and stderr
                           will be passed untouched back to the orgalorg.
                           Exclude '--post-action'.
@@ -311,7 +311,7 @@ func synchronize(args map[string]interface{}) error {
 	logger.Infof(`global lock acquired on %d nodes`, len(cluster.nodes))
 
 	if lockOnly {
-		logger.Info("-L|--stop-at-lock was passed, waiting for interrupt...")
+		logger.Warning("-L|--stop-at-lock was passed, waiting for interrupt...")
 
 		wait := sync.WaitGroup{}
 		wait.Add(1)
@@ -331,7 +331,7 @@ func synchronize(args map[string]interface{}) error {
 	logger.Info(`upload done`)
 
 	if uploadOnly {
-		logger.Info("-d|--stop-at-upload was passed, finishing...")
+		logger.Warning("-d|--stop-at-upload was passed, finishing...")
 	}
 
 	return nil

diff --git a/run_tests.sh → run_tests b/run_tests.sh → run_tests
diff --git a/tests/testcases/can-acquire-global-lock.test.sh b/tests/testcases/can-acquire-global-lock.test.sh
@@ -4,7 +4,7 @@ tests:run-background orgalorg_pid \
     tests:silence tests:pipe \
         :orgalorg-key --stop-at-lock '2>&1' '|' tee $orgalorg_output
 
-while ! cat "$orgalorg_output" 2>/dev/null | grep -qF "global lock acquired"
+while ! cat "$orgalorg_output" 2>/dev/null | grep -qF "waiting for interrupt"
 do
     tests:debug "[orgalorg] waiting for global lock..."
     sleep 0.1