tests: Correct tap_generator skip() when count is greater than 1

[lttng-tools.git] / tests / utils / lttngtest / tap_generator.py

diff --git a/tests/utils/lttngtest/tap_generator.py b/tests/utils/lttngtest/tap_generator.py
index c05a76a1968fa66ba77264e42de8aaff29e304af..c9bd8edaddd14b31992e1dbd9338ba3bc3e18f63 100644 (file)
--- a/tests/utils/lttngtest/tap_generator.py
+++ b/tests/utils/lttngtest/tap_generator.py
@@ -13,9 +13,16 @@ from typing import Iterator, Optional
 
 
 def _get_time_ns():
-    assert sys.version_info > (3, 3, 0)
-    # time.monotonic_ns is only available for python >= 3.8
-    return time.monotonic() * 1000000000
+    # type: () -> int
+
+    # time.monotonic is only available since Python 3.3. We don't support
+    # those older versions so we can simply assert here.
+    assert sys.version_info >= (3, 3, 0)
+
+    # time.monotonic_ns is only available for python >= 3.8,
+    # so the value is multiplied by 10^9 to maintain compatibility with
+    # older versions of the interpreter.
+    return int(time.monotonic() * 1000000000)
 
 
 class InvalidTestPlan(RuntimeError):
@@ -79,7 +86,7 @@ class TapGenerator:
         self._printed_plan = False  # type: bool
         self._has_failure = False  # type: bool
         self._time_tests = True  # type: bool
-        if os.getenv("TAP_AUTOTIME", "1") == "" or os.getenv("TAP_AUTOTIME", "1") == "0":
+        if os.getenv("LTTNG_TESTS_TAP_AUTOTIME", "1") == "0":
             self._time_tests = False
         self._last_time = _get_time_ns()
 
@@ -123,7 +130,7 @@ class TapGenerator:
             self._last_test_case_id = self._last_test_case_id + 1
             self._print(
                 "ok {test_number} # Skip: {reason}".format(
-                    reason=reason, test_number=(i + self._last_test_case_id)
+                    reason=reason, test_number=(self._last_test_case_id)
                 )
             )