Python2+3: tests import correctly

theotherjimmy · theotherjimmy · commit 45bdd98a859a · 2018-02-05T11:04:36.000-06:00
diff --git a/tools/build_travis.py b/tools/build_travis.py
@@ -414,13 +414,6 @@ def run_test_linking(dry_run, vendor):
                             if os.system(cmdline) != 0:
                                 sys.exit(1)
 
-def run_test_testsuite(dry_run, vendor):
-    cmdline = "python tools/singletest.py --version"
-    print "Executing: " + cmdline
-    if not dry_run:
-        if os.system(cmdline) != 0:
-            sys.exit(1)
-
 if __name__ == "__main__":
     parser = ArgumentParser()
 
@@ -434,4 +427,3 @@ def run_test_testsuite(dry_run, vendor):
 
     run_builds("-s" in sys.argv, options.vendor)
     run_test_linking("-s" in sys.argv, options.vendor)
-    run_test_testsuite("-s" in sys.argv, options.vendor)
diff --git a/tools/detect_targets.py b/tools/detect_targets.py
@@ -15,6 +15,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 import sys
 import os
 import re
@@ -67,8 +68,8 @@ def main():
 
         # Only prints matrix of supported toolchains
         if options.supported_toolchains:
-            print mcu_toolchain_matrix(
-                platform_filter=options.general_filter_regex)
+            print(mcu_toolchain_matrix(
+                platform_filter=options.general_filter_regex))
             exit(0)
 
         # If auto_detect attribute is present, we assume other auto-detection
@@ -81,23 +82,23 @@ def main():
         for mut in muts.values():
             if re.match(mcu_filter, mut['mcu']):
                 interface_version = get_interface_version(mut['disk'])
-                print ""
-                print "[mbed] Detected %s, port %s, mounted %s, interface version %s:" % \
-                        (mut['mcu'], mut['port'], mut['disk'], interface_version)
-                                    
-                print "[mbed] Supported toolchains for %s" % mut['mcu']
-                print mcu_toolchain_matrix(platform_filter=mut['mcu'])
+                print("")
+                print("[mbed] Detected %s, port %s, mounted %s, interface "
+                      "version %s:" %
+                      (mut['mcu'], mut['port'], mut['disk'], interface_version))
+                print("[mbed] Supported toolchains for %s" % mut['mcu'])
+                print(mcu_toolchain_matrix(platform_filter=mut['mcu']))
                 count += 1
 
         if count == 0:
-            print "[mbed] No mbed targets were detected on your system."
+            print("[mbed] No mbed targets were detected on your system.")
 
     except KeyboardInterrupt:
-        print "\n[CTRL+c] exit"
+        print("\n[CTRL+c] exit")
     except Exception as exc:
         import traceback
         traceback.print_exc(file=sys.stdout)
-        print "[ERROR] %s" % str(exc)
+        print("[ERROR] %s" % str(exc))
         sys.exit(1)
         
 def get_interface_version(mount_point):
diff --git a/tools/host_tests/__init__.py b/tools/host_tests/__init__.py
@@ -15,25 +15,25 @@
 limitations under the License.
 """
 
-from host_registry import HostRegistry
+from .host_registry import HostRegistry
 
 # Host test supervisors
-from echo import EchoTest
-from rtc_auto import RTCTest
-from stdio_auto import StdioTest
-from hello_auto import HelloTest
-from detect_auto import DetectPlatformTest
-from default_auto import DefaultAuto
-from dev_null_auto import DevNullTest
-from wait_us_auto import WaitusTest
-from tcpecho_server_auto import TCPEchoServerTest
-from udpecho_server_auto import UDPEchoServerTest
-from tcpecho_client_auto import TCPEchoClientTest
-from udpecho_client_auto import UDPEchoClientTest
-from wfi_auto import WFITest
-from serial_nc_rx_auto import SerialNCRXTest
-from serial_nc_tx_auto import SerialNCTXTest
-from serial_complete_auto import SerialCompleteTest
+from .echo import EchoTest
+from .rtc_auto import RTCTest
+from .stdio_auto import StdioTest
+from .hello_auto import HelloTest
+from .detect_auto import DetectPlatformTest
+from .default_auto import DefaultAuto
+from .dev_null_auto import DevNullTest
+from .wait_us_auto import WaitusTest
+from .tcpecho_server_auto import TCPEchoServerTest
+from .udpecho_server_auto import UDPEchoServerTest
+from .tcpecho_client_auto import TCPEchoClientTest
+from .udpecho_client_auto import UDPEchoClientTest
+from .wfi_auto import WFITest
+from .serial_nc_rx_auto import SerialNCRXTest
+from .serial_nc_tx_auto import SerialNCTXTest
+from .serial_complete_auto import SerialCompleteTest
 
 # Populate registry with supervising objects
 HOSTREGISTRY = HostRegistry()
diff --git a/tools/host_tests/default_auto.py b/tools/host_tests/default_auto.py
@@ -14,6 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 from sys import stdout
 
@@ -30,7 +31,7 @@ def test(self, selftest):
                     return selftest.RESULT_IO_SERIAL
                 stdout.write(c)
                 stdout.flush()
-        except KeyboardInterrupt, _:
+        except KeyboardInterrupt:
             selftest.notify("\r\n[CTRL+C] exit")
             result = selftest.RESULT_ERROR
         return result
diff --git a/tools/host_tests/host_tests_plugins/__init__.py b/tools/host_tests/host_tests_plugins/__init__.py
@@ -14,26 +14,27 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
-import host_test_registry
+from . import host_test_registry
 
 # This plugins provide 'flashing' methods to host test scripts
-import module_copy_mbed
-import module_copy_shell
-import module_copy_silabs
+from . import module_copy_mbed
+from . import module_copy_shell
+from . import module_copy_silabs
 
 try:
-    import module_copy_smart
+    from . import module_copy_smart
 except:
     pass
 
 #import module_copy_firefox
-import module_copy_mps2
+from . import module_copy_mps2
 
 # Plugins used to reset certain platform
-import module_reset_mbed
-import module_reset_silabs
-import module_reset_mps2
+from . import module_reset_mbed
+from . import module_reset_silabs
+from . import module_reset_mps2
 
 
 # Plugin registry instance
@@ -77,4 +78,4 @@ def get_plugin_caps(type):
 def print_plugin_info():
     """ Prints plugins' information in user friendly way
     """
-    print HOST_TEST_PLUGIN_REGISTRY
+    print(HOST_TEST_PLUGIN_REGISTRY)
diff --git a/tools/host_tests/host_tests_plugins/host_test_plugins.py b/tools/host_tests/host_tests_plugins/host_test_plugins.py
@@ -14,6 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 from os import access, F_OK
 from sys import stdout
@@ -58,16 +59,13 @@ def execute(self, capabilitity, *args, **kwargs):
     def print_plugin_error(self, text):
         """ Function prints error in console and exits always with False
         """
-        print "Plugin error: %s::%s: %s"% (self.name, self.type, text)
+        print("Plugin error: %s::%s: %s" % (self.name, self.type, text))
         return False
 
     def print_plugin_info(self, text, NL=True):
         """ Function prints notification in console and exits always with True
         """
-        if NL:
-            print "Plugin info: %s::%s: %s"% (self.name, self.type, text)
-        else:
-            print "Plugin info: %s::%s: %s"% (self.name, self.type, text),
+        print("Plugin info: %s::%s: %s"% (self.name, self.type, text))
         return True
 
     def print_plugin_char(self, char):
diff --git a/tools/host_tests/host_tests_plugins/host_test_registry.py b/tools/host_tests/host_tests_plugins/host_test_registry.py
@@ -14,6 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 class HostTestRegistry:
     """ Simple class used to register and store
@@ -23,7 +24,7 @@ class HostTestRegistry:
     PLUGINS = {}    # 'Plugin Name' : Plugin Object
 
     def print_error(self, text):
-        print "Plugin load failed. Reason: %s"% text
+        print("Plugin load failed. Reason: %s" % text)
 
     def register_plugin(self, plugin):
         """ Registers and stores plugin inside registry for further use.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_mbed.py b/tools/host_tests/host_tests_plugins/module_copy_mbed.py
@@ -14,9 +14,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 from shutil import copy
-from host_test_plugins import HostTestPluginBase
+from .host_test_plugins import HostTestPluginBase
 from time import sleep
 
 
@@ -32,7 +33,7 @@ def generic_mbed_copy(self, image_path, destination_disk):
             destination_disk += '/'
         try:
             copy(image_path, destination_disk)
-        except Exception, e:
+        except Exception as e:
             self.print_plugin_error("shutil.copy('%s', '%s')"% (image_path, destination_disk))
             self.print_plugin_error("Error: %s"% str(e))
             result = False
diff --git a/tools/host_tests/host_tests_plugins/module_copy_mps2.py b/tools/host_tests/host_tests_plugins/module_copy_mps2.py
@@ -14,12 +14,13 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 import re
 import os, shutil
 from os.path import join
-from host_test_plugins import HostTestPluginBase
 from time import sleep
+from .host_test_plugins import HostTestPluginBase
 
 
 class HostTestPluginCopyMethod_MPS2(HostTestPluginBase):
diff --git a/tools/host_tests/host_tests_plugins/module_copy_shell.py b/tools/host_tests/host_tests_plugins/module_copy_shell.py
@@ -14,12 +14,13 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 import os
 from os.path import join, basename
-from host_test_plugins import HostTestPluginBase
 from time import sleep
 
+from .host_test_plugins import HostTestPluginBase
 
 class HostTestPluginCopyMethod_Shell(HostTestPluginBase):
 
diff --git a/tools/host_tests/host_tests_plugins/module_copy_silabs.py b/tools/host_tests/host_tests_plugins/module_copy_silabs.py
@@ -14,9 +14,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
-from host_test_plugins import HostTestPluginBase
 from time import sleep
+from .host_test_plugins import HostTestPluginBase
 
 
 class HostTestPluginCopyMethod_Silabs(HostTestPluginBase):
diff --git a/tools/host_tests/host_tests_plugins/module_reset_mbed.py b/tools/host_tests/host_tests_plugins/module_reset_mbed.py
@@ -14,8 +14,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
-from host_test_plugins import HostTestPluginBase
+from .host_test_plugins import HostTestPluginBase
 
 
 class HostTestPluginResetMethod_Mbed(HostTestPluginBase):
diff --git a/tools/host_tests/host_tests_plugins/module_reset_mps2.py b/tools/host_tests/host_tests_plugins/module_reset_mps2.py
@@ -14,10 +14,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 import os
-from host_test_plugins import HostTestPluginBase
 from time import sleep
+from .host_test_plugins import HostTestPluginBase
 
 # Note: This plugin is not fully functional, needs improvements
 
diff --git a/tools/host_tests/host_tests_plugins/module_reset_silabs.py b/tools/host_tests/host_tests_plugins/module_reset_silabs.py
@@ -14,8 +14,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
-from host_test_plugins import HostTestPluginBase
+from .host_test_plugins import HostTestPluginBase
 
 
 class HostTestPluginResetMethod_SiLabs(HostTestPluginBase):
diff --git a/tools/host_tests/tcpecho_client_auto.py b/tools/host_tests/tcpecho_client_auto.py
@@ -14,25 +14,29 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+from __future__ import print_function
 
 import sys
 import socket
 from sys import stdout
-from SocketServer import BaseRequestHandler, TCPServer
+try:
+    from SocketServer import BaseRequestHandler, TCPServer
+except ImportError:
+    from socketserver import BaseRequestHandler, TCPServer
 
 class TCPEchoClient_Handler(BaseRequestHandler):
     def handle(self):
         """ One handle per connection
         """
-        print "HOST: Connection received...",
+        print("HOST: Connection received...")
         count = 1;
         while True:
             data = self.request.recv(1024)
             if not data: break
             self.request.sendall(data)
             if '{{end}}' in str(data):
                 print
-                print str(data)
+                print(str(data))
             else:
                 if not count % 10:
                     sys.stdout.write('.')
@@ -82,6 +86,7 @@ def test(self, selftest):
 
         # Returning none will suppress host test from printing success code
         server = TCPServer((SERVER_IP, SERVER_PORT), TCPEchoClient_Handler)
-        print "HOST: Listening for TCP connections: " + SERVER_IP + ":" + str(SERVER_PORT)
+        print("HOST: Listening for TCP connections: %s:%s" %
+              (SERVER_IP, str(SERVER_PORT)))
         self.send_server_ip_port(selftest, SERVER_IP, SERVER_PORT)
         server.serve_forever()
diff --git a/tools/host_tests/tcpecho_server_auto.py b/tools/host_tests/tcpecho_server_auto.py
diff --git a/tools/host_tests/udpecho_client_auto.py b/tools/host_tests/udpecho_client_auto.py
diff --git a/tools/host_tests/udpecho_server_auto.py b/tools/host_tests/udpecho_server_auto.py
diff --git a/tools/memap.py b/tools/memap.py
diff --git a/tools/test_api.py b/tools/test_api.py
diff --git a/tools/test_exporters.py b/tools/test_exporters.py
diff --git a/tools/tests.py b/tools/tests.py
