Cleaning up travis configuration (#283)

configure travis to use industial ci configuration. Now it uses xenial and kinetic

.travis.yml

@@ -1,37 +1,36 @@
-language:
-  - cpp
-  - python
+# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
+# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
+
+dist: xenial
+services:
+  - docker
+language: generic
 python:
   - "2.7"
 compiler:
   - gcc
 
+notifications:
+  email:
+    on_success: always
+    on_failure: always
+
+env:
+  matrix:
+    - ROS_DISTRO="kinetic"   ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu  USE_DEB=true
+    - ROS_DISTRO="kinetic"   PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
+
+matrix:
+  allow_failures:
+    - env: ROS_DISTRO="kinetic"   PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
+
 branches:
   only:
     - master
     - develop
 
 install:
-  - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
-  - wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
-  - sudo apt-get update -qq
-  - sudo apt-get install python-catkin-pkg python-rosdep ros-hydro-catkin -qq
-  - sudo rosdep init
-  - rosdep update
-  - mkdir -p /tmp/ws/src
-  - ln -s `pwd` /tmp/ws/src/package
-  - cd /tmp/ws
-  - rosdep install --from-paths src --ignore-src --rosdistro hydro -y
-  - sudo pip install ujson
-before_script:
-  - source /opt/ros/hydro/setup.bash
-  - catkin_make
-  - catkin_make install
-  - sudo apt-get install ros-hydro-rostest
-  - source devel/setup.bash
-  - export ROS_MASTER_URI=http://localhost:11311
-  - export ROS_HOSTNAME=localhost
+  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+
 script:
-  - rostest rosbridge_library test_all.test
-  - sudo pip uninstall ujson -y -q
-  - rostest rosbridge_library test_all.test
+  - source .ci_config/travis.sh

rosbridge_library/CMakeLists.txt

@@ -48,5 +48,7 @@ catkin_package(
 )
 
 # Test launch files
-# add_rostest(test/test_all.test)
-
+if (CATKIN_ENABLE_TESTING)
+  find_package(rostest REQUIRED)
+  add_rostest(test/test_all.test)
+endif()

rosbridge_library/package.xml

@@ -26,6 +26,7 @@
   <build_depend>geometry_msgs</build_depend>
   <build_depend>message_generation</build_depend>
   <build_depend>python-bson</build_depend>
+  <build_depend>python-ujson</build_depend>
 
   <run_depend>rospy</run_depend>
   <run_depend>roscpp</run_depend>
@@ -37,7 +38,9 @@
   <run_depend>geometry_msgs</run_depend>
   <run_depend>message_runtime</run_depend>
   <run_depend>python-bson</run_depend>
+  <run_depend>python-ujson</run_depend>
 
+  <test_depend>rostest</test_depend>
   <test_depend>actionlib_msgs</test_depend>
   <test_depend>diagnostic_msgs</test_depend>
   <test_depend>nav_msgs</test_depend>

rosbridge_library/test/capabilities/test_call_service.py

@@ -36,6 +36,7 @@ def test_invalid_arguments(self):
     def test_call_service_works(self):
         # First, call the service the 'proper' way
         p = rospy.ServiceProxy("/rosout/get_loggers", GetLoggers)
+        p.wait_for_service()
         ret = p()