On Mon, Nov 10, 2014 at 11:25 AM, Eduardo Otubo <[email protected]> wrote:
In this test case the final drift amount is calculated based on the
subtraction of actual drift and the drift executed on the guest (1800s).
This is only needed when test with reboot is done.
---
 qemu/tests/timedrift_adjust_time.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/qemu/tests/timedrift_adjust_time.py b/qemu/tests/timedrift_adjust_time.py
index 54bed78..5322c79 100644
--- a/qemu/tests/timedrift_adjust_time.py
+++ b/qemu/tests/timedrift_adjust_time.py
@@ -230,12 +230,15 @@ class BackwardtimeTest(TimedriftTest):
         :raise: error.TestFail Exception
         """
         current_diff = self.time_diff(session, clock=clock)
-        excepted_diff = "%s_time_difference" % clock
-        excepted_diff = self.params.get(excepted_diff, "0")
-        for x in re.findall(r"\$\{(.*)\}", excepted_diff):
- excepted_diff = excepted_diff.replace("${%s}" % x, self.params[x])
-        excepted_diff = float(eval(excepted_diff))
-        drift = abs(excepted_diff - current_diff)
+        drift = current_diff
+        if not re.findall("reboot", str((inspect.stack()[4][4]))):


I think we can infer whether 'reboot' variants are being used by looking at the test parameters, rather than using the inspect module.


+            current_diff = self.time_diff(session, clock=clock)
+            excepted_diff = "%s_time_difference" % clock
+            excepted_diff = self.params.get(excepted_diff, "0")
+            for x in re.findall(r"\$\{(.*)\}", excepted_diff):
+ excepted_diff = excepted_diff.replace("${%s}" % x, self.params[x])
+            excepted_diff = float(eval(excepted_diff))
+            drift = abs(excepted_diff - current_diff)
         if drift > self.tolerance:
             raise error.TestFail("%s clock has more that " % clock +
                                  "%s seconds " % self.tolerance +
--
1.9.1


_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel

Reply via email to