tests/extmod: Make test time_res.py more deterministic.

Replace sample-counting approach with direct monotonicity and
resolution tests. The previous method mixed ticks_ms() and RTC
clock sources which could drift, causing non-deterministic results
across platforms. New approach directly tests that time functions
advance at their documented rates.

Signed-off-by: Andrew Leech <[email protected]>

Author: pi-anl

tests/extmod/time_res.py

@@ -7,6 +7,48 @@
     raise SystemExit
 
 
+def test_monotonic_advance(func_name, min_advance_s, sleep_ms):
+    """Test that a time function advances by at least min_advance_s seconds."""
+    try:
+        if func_name.endswith("_time"):
+            # Helper functions defined below
+            time_func = globals()[func_name]
+        else:
+            time_func = getattr(time, func_name)
+    except AttributeError:
+        return None  # Function not available
+
+    t1 = time_func()
+    time.sleep_ms(sleep_ms)
+    t2 = time_func()
+
+    # For tuple return values (gmtime, localtime), compare as tuples
+    if isinstance(t1, tuple) and isinstance(t2, tuple):
+        # Should have changed
+        return t2 != t1
+    # For numeric return values (time, ticks_*)
+    else:
+        # Should have advanced by at least min_advance_s
+        # Use appropriate diff function for ticks
+        if func_name.startswith("ticks_"):
+            diff = time.ticks_diff(t2, t1)
+            if func_name == "ticks_ms":
+                # Expect at least 80% of sleep time (accounting for overhead)
+                return diff >= sleep_ms * 0.8
+            elif func_name == "ticks_us":
+                # Expect at least 80% of sleep time in microseconds
+                return diff >= sleep_ms * 1000 * 0.8
+            elif func_name == "ticks_ns":
+                # Expect at least 80% of sleep time in nanoseconds
+                return diff >= sleep_ms * 1000000 * 0.8
+            elif func_name == "ticks_cpu":
+                # ticks_cpu may return 0 on some ports, just check it advanced
+                return diff > 0 or t2 == 0
+        else:
+            # For time() and other float/int returns
+            return t2 >= t1 + min_advance_s
+
+
 def gmtime_time():
     return time.gmtime(time.time())
 
@@ -16,53 +58,27 @@ def localtime_time():
 
 
 def test():
-    TEST_TIME = 2500
-    EXPECTED_MAP = (
-        # (function name, min. number of results in 2.5 sec)
-        ("time", 3),
-        ("gmtime", 3),
-        ("localtime", 3),
-        ("gmtime_time", 3),
-        ("localtime_time", 3),
-        ("ticks_ms", 15),
-        ("ticks_us", 15),
-        ("ticks_ns", 15),
-        ("ticks_cpu", 15),
+    # Test configuration: (function name, minimum advance in seconds, sleep time in ms)
+    TEST_CONFIG = (
+        ("time", 1, 1200),
+        ("gmtime", 0, 1200),  # gmtime returns tuple, just check it changes
+        ("localtime", 0, 1200),
+        ("gmtime_time", 0, 1200),
+        ("localtime_time", 0, 1200),
+        ("ticks_ms", 0, 150),  # Test millisecond resolution
+        ("ticks_us", 0, 150),  # Test microsecond resolution
+        ("ticks_ns", 0, 150),  # Test nanosecond resolution
+        ("ticks_cpu", 0, 150),
     )
 
-    # call time functions
-    results_map = {}
-    end_time = time.ticks_ms() + TEST_TIME
-    while time.ticks_diff(end_time, time.ticks_ms()) > 0:
-        time.sleep_ms(100)
-        for func_name, _ in EXPECTED_MAP:
-            try:
-                if func_name.endswith("_time"):
-                    time_func = globals()[func_name]
-                else:
-                    time_func = getattr(time, func_name)
-                now = time_func()  # may raise AttributeError
-            except AttributeError:
-                continue
-            try:
-                results_map[func_name].add(now)
-            except KeyError:
-                results_map[func_name] = {now}
-
-    # check results
-    for func_name, min_len in EXPECTED_MAP:
+    for func_name, min_advance, sleep_ms in TEST_CONFIG:
         print("Testing %s" % func_name)
-        results = results_map.get(func_name)
-        if results is None:
-            pass
-        elif func_name == "ticks_cpu" and results == {0}:
-            # ticks_cpu() returns 0 on some ports (e.g. unix)
+        result = test_monotonic_advance(func_name, min_advance, sleep_ms)
+        if result is None:
+            # Function not available, skip silently
             pass
-        elif len(results) < min_len:
-            print(
-                "%s() returns %s result%s in %s ms, expecting >= %s"
-                % (func_name, len(results), "s"[: len(results) != 1], TEST_TIME, min_len)
-            )
+        elif not result:
+            print("%s() did not advance as expected" % func_name)
 
 
 test()