Merge pull request #8 from cefn/master

[hackapet/Adafruit_Blinka.git] / test / src / testing / __init__.py

diff --git a/test/src/testing/__init__.py b/test/src/testing/__init__.py
index 859b4fe9ec163fe780731ebcab7b175e2ba0a27d..d8c29fb37db902efcdab1bac0d5be46f2d63d831 100644 (file)
--- a/test/src/testing/__init__.py
+++ b/test/src/testing/__init__.py
@@ -1,7 +1,6 @@
 # mitigate heap fragmentation issues by pre-loading major libraries
 import gc
 gc.collect()
-gc.collect()
 import unittest
 gc.collect()
 
@@ -36,12 +35,12 @@ def multi_choice(q, choices, defaultPos=None):
         return None
 
 def await_true(name, fun, interval=0, patience=60):
-    from adafruit_blinka.agnostic import sleep
-    from utime import ticks_ms, ticks_add, ticks_diff
+    from adafruit_blinka.agnostic.time import sleep, monotonic
     print("Waiting {} sec until {} (CTRL+C give up)".format(patience, name))
-    deadline = ticks_add(ticks_ms(), int(patience * 1000))
+
+    deadline =  monotonic() + patience
     try:
-        while ticks_diff(deadline, ticks_ms()) > 0:
+        while deadline - monotonic() > 0:
             if fun():
                 return True
             else:
@@ -91,12 +90,12 @@ def test_prepare(casetype):
 
 def main():
     """
-    moduleNames = ["testing.implementation.all.digitalio",]
+    moduleNames = ["testing.implementation.universal.digitalio",]
     if agnostic.implementation == "micropython":
         moduleNames.extend([ "testing.implementation.micropython.digitalio",])
 
     """
-    moduleNames = ["testing.implementation.all.bitbangio"]
+    moduleNames = ["testing.implementation.universal.bitbangio"]
 
     unittest.raiseException = True # terminates with stack information on userspace Exception
     unittest.raiseBaseException = True # terminates with stack information on system Exception