From a272c2d13d7ab63d7a1f5fd41428e9e7c8320b06 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Nov 2012 15:16:49 +0000 Subject: fish: Add test for remote events. This test was present in git, but not included in the tarball, nor in the tests that guestfish actually runs. This fixes commit 17182af3a6de8e3e94e0a914416c54f09bb74007. Cherry picked from commit 715afda3416080ef9ee961f3ebcff7ef16cfc986 and commit 784e53287e18c324dda9c4cc93b9aae4790eb909. For the stable-1.18 branch the test has been deliberately disabled. --- fish/Makefile.am | 2 ++ fish/test-remote-events.sh | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fish/Makefile.am b/fish/Makefile.am index b2cb973e..f1b95a45 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -266,6 +266,7 @@ TESTS += \ test-mount-local.sh \ test-read-file.sh \ test-remote.sh \ + test-remote-events.sh \ test-reopen.sh \ test-stringlist.sh \ test-upload-to-dir.sh @@ -284,6 +285,7 @@ EXTRA_DIST += \ test-mount-local.sh \ test-read-file.sh \ test-remote.sh \ + test-remote-events.sh \ test-reopen.sh \ test-stringlist.sh \ test-tilde.sh \ diff --git a/fish/test-remote-events.sh b/fish/test-remote-events.sh index bf96db69..0501b398 100755 --- a/fish/test-remote-events.sh +++ b/fish/test-remote-events.sh @@ -18,6 +18,9 @@ # Test remote events in guestfish. +# DISABLE FOR STABLE-1.18 BRANCH. +exit 77 + set -e eval "$(./guestfish --listen)" @@ -25,7 +28,7 @@ eval "$(./guestfish --listen)" ./guestfish --remote event close_event close "echo closed" output="$(./guestfish --remote list-events)" -if [ "$output" != '"close_event": (0): close: echo closed' ]; then +if [ "$output" != '"close_event" (0): close: echo closed' ]; then echo "$0: list-events failed:" echo "$output" ./guestfish --remote exit @@ -35,7 +38,7 @@ fi # Test close event (RHBZ#802389). output="$(./guestfish --remote quit)" -if [ "$output" != '"closed"']; then +if [ "$output" != 'closed' ]; then echo "$0: close event failed:" echo "$output" exit 1 -- cgit