Moved testing out of top level python path

diff --git a/python/testing/__init__.py b/test/src/testing/__init__.py
similarity index 98%
rename from python/testing/__init__.py
rename to test/src/testing/__init__.py
index 5be50c18ee5651271ad8826e943026b2ec3dede1..859b4fe9ec163fe780731ebcab7b175e2ba0a27d 100644 (file)
--- a/python/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()
-import agnostic
 gc.collect()
 import unittest
 gc.collect()
@@ -37,7 +36,7 @@ def multi_choice(q, choices, defaultPos=None):
         return None
 
 def await_true(name, fun, interval=0, patience=60):
-    from agnostic import sleep
+    from adafruit_blinka.agnostic import sleep
     from utime import ticks_ms, ticks_add, ticks_diff
     print("Waiting {} sec until {} (CTRL+C give up)".format(patience, name))
     deadline = ticks_add(ticks_ms(), int(patience * 1000))

diff --git a/python/testing/mcp.py b/test/src/testing/adafruit_blinka.py
similarity index 94%
rename from python/testing/mcp.py
rename to test/src/testing/adafruit_blinka.py
index 131def0fd814b612b946d79e397fe8e69f6b42c0..91a2c84c9415bcf9c32f5d66968a19648bbb7c3d 100644 (file)
--- a/python/testing/mcp.py
+++ b/test/src/testing/adafruit_blinka.py
@@ -9,8 +9,8 @@ class TestEnum(unittest.TestCase):
 
     def setUp(self):
         """Create an example Enum, mocking __module__ and __qualname__"""
-        import mcp
-        class Cls(mcp.Enum):
+        import adafruit_blinka
+        class Cls(adafruit_blinka.Enum):
             pass
         Cls.one = Cls()
         Cls.two = Cls()

diff --git a/python/testing/board/__init__.py b/test/src/testing/board/__init__.py
similarity index 77%
rename from python/testing/board/__init__.py
rename to test/src/testing/board/__init__.py
index c38abc6e23c34f180a6a8be549901f6f3885f274..0732f78b4954c69486ea33d27b6bb80e7a9440f9 100644 (file)
--- a/python/testing/board/__init__.py
+++ b/test/src/testing/board/__init__.py
@@ -1,22 +1,21 @@
 """Configuration of testing fixtures depending on the board layout"""
-import agnostic
-import board
+from adafruit_blinka import agnostic
+
 if agnostic.board == "feather_m0_express":
-    from board import feather_m0_express
     default_pin = feather_m0_express.D5
     led_pin = feather_m0_express.D13
     led_hardwired = True
     led_inverted = False
 elif agnostic.board == "feather_huzzah":
-    from board import feather_huzzah
+    from adafruit_blinka.board import feather_huzzah
+
     default_pin = feather_huzzah.GPIO4
     led_pin = feather_huzzah.GPIO0 # red led
     led_hardwired = True
     led_inverted = True
 elif agnostic.board == "pyboard":
-    from board import pyboard
     default_pin = pyboard.X1
-    led_pin = board.pyboard.LED_BLUE
+    led_pin = adafruit_blinka.board.pyboard.LED_BLUE
     led_hardwired = True
     led_inverted = False
 else:

diff --git a/python/testing/implementation/__init__.py b/test/src/testing/implementation/__init__.py
similarity index 100%
rename from python/testing/implementation/__init__.py
rename to test/src/testing/implementation/__init__.py

diff --git a/python/testing/implementation/all/__init__.py b/test/src/testing/implementation/all/__init__.py
similarity index 100%
rename from python/testing/implementation/all/__init__.py
rename to test/src/testing/implementation/all/__init__.py

diff --git a/python/testing/implementation/all/bitbangio.py b/test/src/testing/implementation/all/bitbangio.py
similarity index 100%
rename from python/testing/implementation/all/bitbangio.py
rename to test/src/testing/implementation/all/bitbangio.py

diff --git a/python/testing/implementation/all/busio.py b/test/src/testing/implementation/all/busio.py
similarity index 100%
rename from python/testing/implementation/all/busio.py
rename to test/src/testing/implementation/all/busio.py

diff --git a/python/testing/implementation/all/digitalio.py b/test/src/testing/implementation/all/digitalio.py
similarity index 98%
rename from python/testing/implementation/all/digitalio.py
rename to test/src/testing/implementation/all/digitalio.py
index f68a7603010da918b16748eb70c102bd6988d2c5..dbeda1af872e580ac2a7e2fd7cf4aa4f26c05cc2 100644 (file)
--- a/python/testing/implementation/all/digitalio.py
+++ b/test/src/testing/implementation/all/digitalio.py
@@ -33,7 +33,7 @@ class TestDigitalInOutInteractive(unittest.TestCase):
     def test_blink(self):
         """LED blinks when proper attributes set"""
         print()
-        from agnostic import sleep
+        from adafruit_blinka.agnostic import sleep
         if not(led_hardwired) and not(yes_no("Is LED wired to {}".format(led_pin))):
             return # test trivially passed
         with DigitalInOut(led_pin) as led:

diff --git a/python/testing/implementation/all/microcontroller.py b/test/src/testing/implementation/all/microcontroller.py
similarity index 100%
rename from python/testing/implementation/all/microcontroller.py
rename to test/src/testing/implementation/all/microcontroller.py

diff --git a/python/testing/implementation/circuitpython/__init__.py b/test/src/testing/implementation/circuitpython/__init__.py
similarity index 100%
rename from python/testing/implementation/circuitpython/__init__.py
rename to test/src/testing/implementation/circuitpython/__init__.py

diff --git a/python/testing/implementation/circuitpython/digitalio.py b/test/src/testing/implementation/circuitpython/digitalio.py
similarity index 100%
rename from python/testing/implementation/circuitpython/digitalio.py
rename to test/src/testing/implementation/circuitpython/digitalio.py

diff --git a/python/testing/implementation/micropython/__init__.py b/test/src/testing/implementation/micropython/__init__.py
similarity index 100%
rename from python/testing/implementation/micropython/__init__.py
rename to test/src/testing/implementation/micropython/__init__.py

diff --git a/python/testing/implementation/micropython/digitalio.py b/test/src/testing/implementation/micropython/digitalio.py
similarity index 100%
rename from python/testing/implementation/micropython/digitalio.py
rename to test/src/testing/implementation/micropython/digitalio.py

diff --git a/python/testing/microcontroller/__init__.py b/test/src/testing/microcontroller/__init__.py
similarity index 76%
rename from python/testing/microcontroller/__init__.py
rename to test/src/testing/microcontroller/__init__.py
index f8dc6f5c418b067a9a82147360fec35cc1cde389..deb21aa7f4dc89a42f82b07ab2b4d64dc4bcd3ca 100644 (file)
--- a/python/testing/microcontroller/__init__.py
+++ b/test/src/testing/microcontroller/__init__.py
@@ -1,4 +1,4 @@
-from agnostic import microcontroller
+from adafruit_blinka.agnostic import microcontroller
 
 if microcontroller == "esp8266":
     pin_count = 10

diff --git a/python/testing/profiling/__init__.py b/test/src/testing/profiling/__init__.py
similarity index 100%
rename from python/testing/profiling/__init__.py
rename to test/src/testing/profiling/__init__.py