Merge pull request #610 from openweave/feature/happy_py3_support

Upgrade the happy tests with python3 support

Author: robszewczyk

.travis/before_install.sh

@@ -58,11 +58,10 @@ installdeps()
             sudo apt-get update
             sudo apt-get -y install bridge-utils
             sudo apt-get -y install lcov
-            sudo apt-get -y install python-lockfile
-            sudo apt-get -y install python-psutil
-            sudo apt-get -y install python-setuptools
-            sudo apt-get -y install swig
-
+            sudo apt-get -y install python3-lockfile
+            sudo apt-get -y install python3-pip
+            sudo apt-get -y install python3-setuptools
+            sudo apt-get -y install python3-psutil
             ;;
 
         openssl-deps)
@@ -161,11 +160,10 @@ case "${BUILD_TARGET}" in
         installdeps "happy-deps"
 
         cd $HOME
-        git clone https://github.com/openweave/happy.git
+        git clone --single-branch --branch feature/happy_py3_support https://github.com/openweave/happy.git
         cd ${HOME}/happy
         make install
-        python pip_packages.py
-        pip install pexpect
+        python3 pip_packages.py
         sudo apt install python-gobject
         sudo apt install python-dbus
 

configure.ac

@@ -316,7 +316,7 @@ esac
 
 # Check for Python
 
-AM_PATH_PYTHON
+AM_PATH_PYTHON([3.5])
 
 # If a Python interpreter of any color cannot be found, error out.
 
@@ -836,7 +836,7 @@ else
     fi
 fi
 if test "${with_happy}" != "no"; then
-    PYTHONPATH=${happy_path}:${PYTHONPATH} python -c 'import happy' 2> /dev/null
+    PYTHONPATH=${happy_path}:${PYTHONPATH} ${PYTHON} -c 'import happy' 2> /dev/null
     if test $? != 0; then
         if test "${with_happy}" = "yes"; then
             if test -z ${happy_path}; then
@@ -855,7 +855,7 @@ if test "${with_happy}" != "no"; then
 fi
 if test "${with_happy}" = "yes"; then
     HAPPY_MINIMUM_VERSION="1.1.36"
-    happy_version=`PYTHONPATH=${happy_path}:${PYTHONPATH} ${PYTHON} -c 'import happy; print happy.__version__ if "__version__" in dir(happy) else "0.0.0"'`
+    happy_version=`PYTHONPATH=${happy_path}:${PYTHONPATH} ${PYTHON} -c 'import happy; print(happy.__version__) if "__version__" in dir(happy) else "0.0.0"'`
     AX_COMPARE_VERSION([${HAPPY_MINIMUM_VERSION}],[gt],[${happy_version}],[AC_MSG_ERROR(["The Nest Labs network functional test framework (Happy) is installed with version ${happy_version}; however, Weave test apps require at least version ${HAPPY_MINIMUM_VERSION}."])],[])
 fi
 AC_MSG_RESULT(${with_happy})

doc/guides/cross-network-inet-multicast-howto.md

@@ -20,7 +20,7 @@ While it is not particularly important where you clone and build the `mcproxy` d
 
 ```
 % git clone https://github.com/openweave/happy.git happy
-% sudo apt-get install bridge-utils python-lockfile python-psutil python-setuptools
+% sudo apt-get install bridge-utils python3-lockfile python3-pip python3-psutil python3-setuptools
 % cd happy
 % sudo make install
 ```

src/test-apps/happy/bin/set_test_path.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #
 #    Copyright (c) 2017 Nest Labs, Inc.
@@ -18,6 +18,7 @@
 #
 
 
+from __future__ import absolute_import
 import os
 import sys
 

src/test-apps/happy/bin/weave-bdx.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 
 #
@@ -25,6 +25,8 @@
 #       The command is executed by instantiating and running WeaveBDX class.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import getopt
 import sys
 import set_test_path
@@ -41,13 +43,13 @@
                         "download=", "offset=", "length=", "tap=", "server-version=", "client-version="])
 
 	except getopt.GetoptError as err:
-		print WeaveBDX.WeaveBDX.__doc__
-		print hred(str(err))
+		print(WeaveBDX.WeaveBDX.__doc__)
+		print(hred(str(err)))
                 sys.exit(hred("%s: Failed destination parse arguments." % (__file__)))
 
 	for o, a in opts:
 		if o in ("-h", "--help"):
-			print WeaveBDX.WeaveBDX.__doc__
+			print(WeaveBDX.WeaveBDX.__doc__)
 			sys.exit(0)
 
 		elif o in ("-q", "--quiet"):

src/test-apps/happy/bin/weave-connection-tunnel.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 
 #
@@ -25,6 +25,8 @@
 #       The command is executed by instantiating and running WeaveConnectionTunnel class.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import getopt
 import sys
 import set_test_path
@@ -40,13 +42,13 @@
             ["help", "agent=", "source=", "destination=", "quiet", "tap="])
 
     except getopt.GetoptError as err:
-        print WeaveConnectionTunnel.WeaveConnectionTunnel.__doc__
-        print hred(str(err))
+        print(WeaveConnectionTunnel.WeaveConnectionTunnel.__doc__)
+        print(hred(str(err)))
         sys.exit(hred("%s: Failed to parse arguments." % (__file__)))
 
     for o, a in opts:
         if o in ("-h", "--help"):
-            print WeaveConnectionTunnel.WeaveConnectionTunnel.__doc__
+            print(WeaveConnectionTunnel.WeaveConnectionTunnel.__doc__)
             sys.exit(0)
 
         elif o in ("-q", "--quiet"):

src/test-apps/happy/bin/weave-device-description.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 
 #
@@ -25,6 +25,8 @@
 #       The command is executed by instantiating and running WeaveDeviceDescription class.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import getopt
 import sys
 import set_test_path
@@ -41,13 +43,13 @@
             ["help", "quiet", "server=", "client=", "tap="])
 
     except getopt.GetoptError as err:
-        print WeaveDeviceDescription.WeaveDeviceDescription.__doc__
-        print hred(str(err))
+        print(WeaveDeviceDescription.WeaveDeviceDescription.__doc__)
+        print(hred(str(err)))
         sys.exit(hred("%s: Failed destination parse arguments." % (__file__)))
 
     for o, a in opts:
         if o in ("-h", "--help"):
-            print WeaveDeviceDescription.WeaveDeviceDescription.__doc__
+            print(WeaveDeviceDescription.WeaveDeviceDescription.__doc__)
             sys.exit(0)
 
         elif o in ("-q", "--quiet"):

src/test-apps/happy/bin/weave-fabric-add.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #
 #    Copyright (c) 2015-2017 Nest Labs, Inc.
@@ -24,6 +24,8 @@
 #       The command is executed by instantiating and running WeaveFabricAdd class.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import getopt
 import sys
 import set_test_path
@@ -39,13 +41,13 @@
                                    ["help", "id=", "quiet"])
 
     except getopt.GetoptError as err:
-        print WeaveFabricAdd.WeaveFabricAdd.__doc__
-        print hred(str(err))
+        print(WeaveFabricAdd.WeaveFabricAdd.__doc__)
+        print(hred(str(err)))
         sys.exit(hred("%s: Failed to parse arguments." % (__file__)))
 
     for o, a in opts:
         if o in ("-h", "--help"):
-            print WeaveFabricAdd.WeaveFabricAdd.__doc__
+            print(WeaveFabricAdd.WeaveFabricAdd.__doc__)
             sys.exit(0)
 
         elif o in ("-q", "--quiet"):

src/test-apps/happy/bin/weave-fabric-delete.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #
 #    Copyright (c) 2015-2017 Nest Labs, Inc.
@@ -24,6 +24,8 @@
 #       The command is executed by instantiating and running WeaveFabricDelete class.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import getopt
 import sys
 import set_test_path
@@ -39,13 +41,13 @@
                                    ["help", "id=", "quiet"])
 
     except getopt.GetoptError as err:
-        print WeaveFabricDelete.WeaveFabricDelete.__doc__
-        print hred(str(err))
+        print(WeaveFabricDelete.WeaveFabricDelete.__doc__)
+        print(hred(str(err)))
         sys.exit(hred("%s: Failed to parse arguments." % (__file__)))
 
     for o, a in opts:
         if o in ("-h", "--help"):
-            print WeaveFabricDelete.WeaveFabricDelete.__doc__
+            print(WeaveFabricDelete.WeaveFabricDelete.__doc__)
             sys.exit(0)
 
         elif o in ("-q", "--quiet"):

src/test-apps/happy/bin/weave-heartbeat.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 
 #
@@ -25,6 +25,8 @@
 #       The command is executed by instantiating and running WeaveHeartbeat class.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import getopt
 import sys
 import set_test_path
@@ -40,13 +42,13 @@
 			["help", "origin=", "server=", 
 				"count=", "quiet", "tap="])
 	except getopt.GetoptError as err:
-		print WeaveHeartbeat.WeaveHeartbeat.__doc__
-		print hred(str(err))
+		print(WeaveHeartbeat.WeaveHeartbeat.__doc__)
+		print(hred(str(err)))
                 sys.exit(hred("%s: Failed server parse arguments." % (__file__)))
 
 	for o, a in opts:
 		if o in ("-h", "--help"):
-			print WeaveHeartbeat.WeaveHeartbeat.__doc__
+			print(WeaveHeartbeat.WeaveHeartbeat.__doc__)
 			sys.exit(0)
 
 		elif o in ("-q", "--quiet"):