tests: add spread suite for ament plugin (#2211)

Move the snapd integration test for the Ament plugin into a Spread suite. LP: #1783827 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
canonical · Aug 13, 2018 · bdaa8ea · bdaa8ea
1 parent c1b0eaf
commit bdaa8ea
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 51 deletions.
diff --git a/spread.yaml b/spread.yaml
@@ -176,6 +176,8 @@ prepare: |
 restore: $SETUP_DIR/restore.sh
 
 suites:
+ tests/spread/plugins/ament/:
+   summary: tests of snapcraft's Ament plugin
  tests/spread/plugins/autotools/:
    summary: tests of snapcraft's Autotools plugin
  tests/spread/plugins/catkin/:

diff --git a/tests/integration/snapd/test_ament_snap.py b/tests/integration/snapd/test_ament_snap.py
diff --git a/tests/spread/plugins/ament/run/task.yaml b/tests/spread/plugins/ament/run/task.yaml
@@ -0,0 +1,21 @@
+summary: Build and run a basic ROS2 snap
+warn-timeout: 9m  # Keep less than 10 minutes so Travis can't timeout
+kill-timeout: 40m
+priority: 100  # Run this test early so we're not waiting for it
+
+# The ament plugin only supports 16.04
+systems: [ubuntu-16.04*]
+
+environment:
+  SNAP_DIR: ../snaps/ros2-talker-listener
+
+restore: |
+  cd "$SNAP_DIR"
+  snapcraft clean
+  rm -f ./*.snap
+
+execute: |
+  cd "$SNAP_DIR"
+  snapcraft
+  sudo snap install ros2-talker-listener_*.snap --dangerous
+  ros2-talker-listener | MATCH "I heard: Hello world"
diff --git a/...ntegration/snaps/ros2/snap/snapcraft.yaml → .../ros2-talker-listener/snap/snapcraft.yaml b/...ntegration/snaps/ros2/snap/snapcraft.yaml → .../ros2-talker-listener/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
-name: ros2-example
-version: '0.1'
+name: ros2-talker-listener
+version: '1.0'
 summary: ROS2 Example
 description: |
   A ROS2 workspace containing a talker and a listener.
@@ -8,7 +8,7 @@ grade: stable
 confinement: strict
 
 apps:
-  launch-project:
+  ros2-talker-listener:
     command: launch "$(ros2 pkg prefix listener_py)/share/listener_py/launch/talk_and_listen.py"
     plugs: [network]
     environment:

diff --git a/...src/listener_py/launch/talk_and_listen.py → ...src/listener_py/launch/talk_and_listen.py b/...src/listener_py/launch/talk_and_listen.py → ...src/listener_py/launch/talk_and_listen.py
diff --git a/...ps/ros2/src/listener_py/nodes/__init__.py → ...istener/src/listener_py/nodes/__init__.py b/...ps/ros2/src/listener_py/nodes/__init__.py → ...istener/src/listener_py/nodes/__init__.py
diff --git a/...ps/ros2/src/listener_py/nodes/listener.py → ...istener/src/listener_py/nodes/listener.py b/...ps/ros2/src/listener_py/nodes/listener.py → ...istener/src/listener_py/nodes/listener.py
diff --git a/...on/snaps/ros2/src/listener_py/package.xml → ...lker-listener/src/listener_py/package.xml b/...on/snaps/ros2/src/listener_py/package.xml → ...lker-listener/src/listener_py/package.xml
diff --git a/...tion/snaps/ros2/src/listener_py/setup.cfg → ...talker-listener/src/listener_py/setup.cfg b/...tion/snaps/ros2/src/listener_py/setup.cfg → ...talker-listener/src/listener_py/setup.cfg
diff --git a/...ation/snaps/ros2/src/listener_py/setup.py → ...-talker-listener/src/listener_py/setup.py b/...ation/snaps/ros2/src/listener_py/setup.py → ...-talker-listener/src/listener_py/setup.py
diff --git a/.../snaps/ros2/src/talker_cpp/CMakeLists.txt → ...er-listener/src/talker_cpp/CMakeLists.txt b/.../snaps/ros2/src/talker_cpp/CMakeLists.txt → ...er-listener/src/talker_cpp/CMakeLists.txt
diff --git a/...ion/snaps/ros2/src/talker_cpp/package.xml → ...alker-listener/src/talker_cpp/package.xml b/...ion/snaps/ros2/src/talker_cpp/package.xml → ...alker-listener/src/talker_cpp/package.xml
diff --git a/.../snaps/ros2/src/talker_cpp/src/talker.cpp → ...er-listener/src/talker_cpp/src/talker.cpp b/.../snaps/ros2/src/talker_cpp/src/talker.cpp → ...er-listener/src/talker_cpp/src/talker.cpp
diff --git a/tests/spread/plugins/catkin/catkin-with-python/task.yaml b/tests/spread/plugins/catkin/catkin-with-python/task.yaml
@@ -1,5 +1,5 @@
 summary: Build a catkin snap that includes a python part
-warn-timeout: 10m
+warn-timeout: 9m  # Keep less than 10 minutes so Travis can't timeout
 kill-timeout: 20m
 priority: 100  # Run this test early so we're not waiting for it
 

diff --git a/tests/spread/plugins/catkin/content-sharing/task.yaml b/tests/spread/plugins/catkin/content-sharing/task.yaml
@@ -1,5 +1,5 @@
 summary: Build two catkin snaps using content sharing
-warn-timeout: 10m
+warn-timeout: 9m  # Keep less than 10 minutes so Travis can't timeout
 kill-timeout: 20m
 priority: 100  # Run this test early so we're not waiting for it
 

diff --git a/tests/spread/plugins/catkin/pip-support/task.yaml b/tests/spread/plugins/catkin/pip-support/task.yaml
@@ -1,5 +1,5 @@
 summary: Build and run catkin snap using pip dependencies
-warn-timeout: 10m
+warn-timeout: 9m  # Keep less than 10 minutes so Travis can't timeout
 kill-timeout: 20m
 priority: 100  # Run this test early so we're not waiting for it
 

diff --git a/tests/spread/plugins/catkin/recursive-rosinstall/task.yaml b/tests/spread/plugins/catkin/recursive-rosinstall/task.yaml
@@ -1,5 +1,5 @@
 summary: Ensure that the catkin plugin can recursively use rosinstall
-warn-timeout: 10m
+warn-timeout: 9m  # Keep less than 10 minutes so Travis can't timeout
 kill-timeout: 20m
 priority: 100  # Run this test early so we're not waiting for it
 

diff --git a/tests/spread/plugins/catkin/run/task.yaml b/tests/spread/plugins/catkin/run/task.yaml
@@ -1,5 +1,5 @@
 summary: Build and run a basic catkin snap
-warn-timeout: 10m
+warn-timeout: 9m  # Keep less than 10 minutes so Travis can't timeout
 kill-timeout: 20m
 priority: 100  # Run this test early so we're not waiting for it