From d40e0b93a58edc9c67184e0108731556bc44b46f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Oct 2014 16:44:00 +0100 Subject: [PATCH] RHEL 7: Revert "tests: rsync: Skip this test when the backend is libvirt." This reverts commit 765dc6237ce7b93dd2f33d99be53eae92e048a7a. --- tests/rsync/test-rsync.sh | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/tests/rsync/test-rsync.sh b/tests/rsync/test-rsync.sh index c6d98cf..2463962 100755 --- a/tests/rsync/test-rsync.sh +++ b/tests/rsync/test-rsync.sh @@ -26,33 +26,10 @@ skip_if_skipped skip_unless rsync --help skip_unless_feature_available rsync -# Get host IP address. XXX Bit of a hack. -backend="$(guestfish get-backend)" -case "$backend" in - direct) - ip=169.254.2.2 - listen_address=localhost - ;; - libvirt|libvirt:*) - # This would work, except that the host firewall is effective - # on virbr0, and that is likely to block the non-standard port - # number that we listen on. -# ip="$(ip -4 -o address show virbr0 | -# awk '{print $4}' | -# awk -F/ '{print $1}')" -# listen_address="$ip" - echo "$0: skipping test because host firewall will probably prevent this test from working" - exit 77 - ;; - uml) - echo "$0: skipping test because networking is not available in the UML backend" - exit 77 - ;; - *) - echo "$0: don't know how to get IP address of backend $backend" - exit 77 - ;; -esac +if [ "$(guestfish get-backend)" = "uml" ]; then + echo "$0: skipping test because networking is not available in the UML backend" + exit 77 +fi pwd="$(pwd)" datadir="$(cd ../../test-data/files && pwd)" @@ -66,7 +43,7 @@ port="$(awk 'BEGIN{srand(); print 65000+int(500*rand())}' rsyncd.conf <