tests: Use python3 for most of it, python2 for cv2

builder/image-validate.sh

@@ -25,7 +25,7 @@ source /home/pi/catkin_ws/devel/setup.bash
 cd /home/pi/catkin_ws/src/clover/builder/test/
 ./tests.sh
 ./tests.py
-./tests_py3.py
+./tests_py2.py
 [[ $(./tests_clever.py) == "Warning: clever package is renamed to clover" ]]  # test backwards compatibility
 
 echo "Move /etc/ld.so.preload back to its original position"

builder/test/tests.py

@@ -29,4 +29,4 @@ import rpi_ws281x
 import pigpio
 from espeak import espeak
 
-print cv2.getBuildInformation()
+print(cv2.getBuildInformation())

builder/test/tests_py2.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+# Make sure our Python 2 software is installed
+
+import cv2
+
+print(cv2.getBuildInformation())

builder/test/tests_py3.py

@@ -1,7 +0,0 @@
-#!/usr/bin/env python3
-
-# Make sure our Python 3 software is installed
-
-import cv2
-
-print(cv2.getBuildInformation())