Fixes #8545: rudder-der merge comment on pr in test mode

Normation · Jun 15, 2016 · 529c2cf · 529c2cf
1 parent 34f0646
commit 529c2cf
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/scripts/rudder-dev/rudder-dev-src b/scripts/rudder-dev/rudder-dev-src
@@ -1421,8 +1421,9 @@ def merge_pr(pr_url, strategy=None, automatic=False, test=False):
   if version is None:
     logfail("**** ERROR: cannot guess version of branch " + pr.base_branch() + " Exiting.")
     exit(15)
-  # comment for the merge
-  pr.comment("""OK, merging this PR""")
+  if not test:
+    # comment for the merge
+    pr.comment("""OK, merging this PR""")
   # regular merge
   merge_branch(pr_branch, version, strategy, automatic, pr.repo()+":"+pr.remote_branch(), test)
   # upmerge