|
 |
151578 |
From f5ce5692f4701fc122af82759a790cfe01a18c35 Mon Sep 17 00:00:00 2001
|
|
|
151578 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
151578 |
Date: Wed, 12 Apr 2017 08:32:58 +0100
|
|
|
151578 |
Subject: [PATCH] v2v: tests: Fix -i vmx test so it is more stable.
|
|
|
151578 |
|
|
|
151578 |
When running under valgrind, the process takes a fraction of a second
|
|
|
151578 |
to start up, changing the "Opening the guest" timestamp, which broke
|
|
|
151578 |
the test.
|
|
|
151578 |
|
|
|
151578 |
Fixes commit ca40078cdda9167d4658ddfe24c828c7ee76be37.
|
|
|
151578 |
|
|
|
151578 |
(cherry picked from commit ec61873d397f050fe28987f10ec919778d27818a)
|
|
|
151578 |
---
|
|
|
151578 |
v2v/test-v2v-i-vmx-1.expected | 2 +-
|
|
|
151578 |
v2v/test-v2v-i-vmx-2.expected | 2 +-
|
|
|
151578 |
v2v/test-v2v-i-vmx-3.expected | 2 +-
|
|
|
151578 |
v2v/test-v2v-i-vmx-4.expected | 2 +-
|
|
|
151578 |
v2v/test-v2v-i-vmx.sh | 1 +
|
|
|
151578 |
5 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
151578 |
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx-1.expected b/v2v/test-v2v-i-vmx-1.expected
|
|
|
151578 |
index c7ef1f5d5..128c34762 100644
|
|
|
151578 |
--- a/v2v/test-v2v-i-vmx-1.expected
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx-1.expected
|
|
|
151578 |
@@ -1,4 +1,4 @@
|
|
|
151578 |
-[ 0.0] Opening the source -i vmx test-v2v-i-vmx-1.vmx
|
|
|
151578 |
+
|
|
|
151578 |
Source guest information (--print-source option):
|
|
|
151578 |
|
|
|
151578 |
source name: BZ1308535_21disks
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx-2.expected b/v2v/test-v2v-i-vmx-2.expected
|
|
|
151578 |
index a04bd0f62..7f3ee8154 100644
|
|
|
151578 |
--- a/v2v/test-v2v-i-vmx-2.expected
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx-2.expected
|
|
|
151578 |
@@ -1,4 +1,4 @@
|
|
|
151578 |
-[ 0.0] Opening the source -i vmx test-v2v-i-vmx-2.vmx
|
|
|
151578 |
+
|
|
|
151578 |
Source guest information (--print-source option):
|
|
|
151578 |
|
|
|
151578 |
source name: Fedora 20
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx-3.expected b/v2v/test-v2v-i-vmx-3.expected
|
|
|
151578 |
index 64808a77b..4664efdec 100644
|
|
|
151578 |
--- a/v2v/test-v2v-i-vmx-3.expected
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx-3.expected
|
|
|
151578 |
@@ -1,4 +1,4 @@
|
|
|
151578 |
-[ 0.0] Opening the source -i vmx test-v2v-i-vmx-3.vmx
|
|
|
151578 |
+
|
|
|
151578 |
Source guest information (--print-source option):
|
|
|
151578 |
|
|
|
151578 |
source name: RHEL 7.1 UEFI
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx-4.expected b/v2v/test-v2v-i-vmx-4.expected
|
|
|
151578 |
index 208920b29..d6dcda5b6 100644
|
|
|
151578 |
--- a/v2v/test-v2v-i-vmx-4.expected
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx-4.expected
|
|
|
151578 |
@@ -1,4 +1,4 @@
|
|
|
151578 |
-[ 0.0] Opening the source -i vmx test-v2v-i-vmx-4.vmx
|
|
|
151578 |
+
|
|
|
151578 |
Source guest information (--print-source option):
|
|
|
151578 |
|
|
|
151578 |
source name: Windows 7 x64
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx.sh b/v2v/test-v2v-i-vmx.sh
|
|
|
151578 |
index 5353e7e2a..997103d41 100755
|
|
|
151578 |
--- a/v2v/test-v2v-i-vmx.sh
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx.sh
|
|
|
151578 |
@@ -37,6 +37,7 @@ for i in 1 2 3 4; do
|
|
|
151578 |
# Normalize the print-source output.
|
|
|
151578 |
mv test-v2v-i-vmx-$i.actual test-v2v-i-vmx-$i.actual.old
|
|
|
151578 |
sed \
|
|
|
151578 |
+ -e "s,.*Opening the source.*,," \
|
|
|
151578 |
-e "s,$(pwd),," \
|
|
|
151578 |
< test-v2v-i-vmx-$i.actual.old > test-v2v-i-vmx-$i.actual
|
|
|
151578 |
rm test-v2v-i-vmx-$i.actual.old
|
|
|
151578 |
--
|
|
|
151578 |
2.14.3
|
|
|
151578 |
|