Some p4 triggers in the server side generate some warnings when
executed. Unfortunately those messages are mixed with the output of
p4 commands. A few git-p4 commands don't expect extra messages or output
lines and may fail with verbose triggers.
New tests added are known to be broken.

Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com>
---
 t/t9831-git-p4-triggers.sh | 103 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100755 t/t9831-git-p4-triggers.sh

diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
new file mode 100755
index 000000000..28cafe469
--- /dev/null
+++ b/t/t9831-git-p4-triggers.sh
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+test_description='git p4 with server triggers'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+       start_p4d
+'
+
+test_expect_success 'init depot' '
+       (
+               cd "$cli" &&
+               echo file1 >file1 &&
+               p4 add file1 &&
+               p4 submit -d "change 1"
+               echo file2 >file2 &&
+               p4 add file2 &&
+               p4 submit -d "change 2"
+       )
+'
+
+test_expect_failure 'clone with extra info lines from verbose p4 trigger' '
+       test_when_finished cleanup_git &&
+       (
+               p4 triggers -i <<-EOF
+               Triggers: p4triggertest-command command pre-user-change "echo 
verbose trigger"
+               EOF
+       ) &&
+       (
+               p4 change -o |  grep -s "verbose trigger"
+       ) &&
+       git p4 clone --dest="$git" //depot/@all &&
+       (
+               p4 triggers -i <<-EOF
+               Triggers:
+               EOF
+       )
+'
+
+test_expect_failure 'import with extra info lines from verbose p4 trigger' '
+       test_when_finished cleanup_git &&
+       (
+               cd "$cli" &&
+               echo file3 >file3 &&
+               p4 add file3 &&
+               p4 submit -d "change 3"
+       ) &&
+       (
+               p4 triggers -i <<-EOF
+               Triggers: p4triggertest-command command pre-user-describe "echo 
verbose trigger"
+               EOF
+       ) &&
+       (
+               p4 describe 1 |  grep -s "verbose trigger"
+       ) &&
+       git p4 clone --dest="$git" //depot/@all &&
+       (
+               cd "$git" &&
+               git p4 sync
+       )&&
+       (
+               p4 triggers -i <<-EOF
+               Triggers:
+               EOF
+       )
+'
+
+test_expect_failure 'submit description with extra info lines from verbose p4 
change trigger' '
+       test_when_finished cleanup_git &&
+       (
+               p4 triggers -i <<-EOF
+               Triggers: p4triggertest-command command pre-user-change "echo 
verbose trigger"
+               EOF
+       ) &&
+       (
+               p4 change -o |  grep -s "verbose trigger"
+       ) &&
+       git p4 clone --dest="$git" //depot &&
+       (
+               cd "$git" &&
+               git config git-p4.skipSubmitEdit true &&
+               echo file4 >file4 &&
+               git add file4 &&
+               git commit -m file4 &&
+               git p4 submit
+       ) &&
+       (
+               p4 triggers -i <<-EOF
+               Triggers:
+               EOF
+       ) &&
+       (
+               cd "$cli" &&
+               test_path_is_file file4
+       )
+'
+
+test_expect_success 'kill p4d' '
+       kill_p4d
+'
+
+test_done
-- 
2.11.0

Reply via email to