From 06ca0ded6f784852a8bfce21a3f5ff7b7624d7de Mon Sep 17 00:00:00 2001 From: Sam Pfeiffer Date: Tue, 8 Dec 2020 15:20:17 +1100 Subject: [PATCH 1/2] Fix test for distros after ubuntu 18.04 Fixes the buildfarm error: ``` 12:18:34 Traceback (most recent call last): 12:18:34 File "/tmp/ws/src/video_stream_opencv/test/mjpg_server.py", line 12, in 12:18:34 from BaseHTTPServer import BaseHTTPRequestHandler 12:18:34 ModuleNotFoundError: No module named 'BaseHTTPServer' ``` --- test/mjpg_server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/mjpg_server.py b/test/mjpg_server.py index db374ec..573dcd3 100755 --- a/test/mjpg_server.py +++ b/test/mjpg_server.py @@ -9,7 +9,10 @@ import rospy import sys import time -from BaseHTTPServer import BaseHTTPRequestHandler +if sys.version_info[0] < 3: + from BaseHTTPServer import BaseHTTPRequestHandler +else: + from http.server import BaseHTTPRequestHandler from BaseHTTPServer import HTTPServer from SocketServer import ThreadingMixIn From 42e28c567e9ad2c5e2ab565d5d21f40d631b1a6c Mon Sep 17 00:00:00 2001 From: Sam Pfeiffer Date: Tue, 8 Dec 2020 19:22:49 +1100 Subject: [PATCH 2/2] Actually enable noetic in testing --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0e99375..d60440a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: matrix: - ROS_DISTRO="kinetic" - ROS_DISTRO="melodic" + - ROS_DISTRO="noetic" install: - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci script: