Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test for distros after ubuntu 18.04 #85

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix test for distros after ubuntu 18.04 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06ca0de
Fix test for distros after ubuntu 18.04
awesomebytes Dec 8, 2020
42e28c5
Actually enable noetic in testing
Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion test/mjpg_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down