exit code for jenkins

KFilipek · Aug 5, 2016 · 55624cd · 55624cd
1 parent be39960
commit 55624cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/scripts/large.sh b/scripts/large.sh
@@ -27,11 +27,8 @@ _docker_project () {
 _debug "building docker compose images"
 _docker_project docker-compose build
 _debug "running test: ${TEST_TYPE}"
-set +e
 _docker_project docker-compose up
-test_res=$?
-set -e
-
+test_res=`docker-compose ps -q | xargs docker inspect -f '{{ .Name }} exited with status {{ .State.ExitCode }}' | awk '{print $5}'`
 echo "exit code from large_jenkins $test_res"
 _debug "stopping docker compose images"
 _docker_project docker-compose stop

diff --git a/scripts/test/large.py b/scripts/test/large.py
@@ -28,11 +28,11 @@ def test_psutil_collector_plugin(self):
         tasks = self.binaries.snapctl.list_tasks()
         self.assertGreater(metrics, 0, "Metrics available %s" % metrics)
         self.assertEqual(plugins, 1, "Plugins available %s" % plugins)
-        self.assertEqual(tasks, 0, "Tasks avaialble %s" % tasks)
+        self.assertEqual(tasks, 0, "Tasks available %s" % tasks)
 
         task_id = self.binaries.snapctl.create_task("/snap-plugin-collector-psutil/scripts/docker/large/psutil-task.yml")
         tasks = self.binaries.snapctl.list_tasks()
-        self.assertEqual(tasks, 1, "Tasks avaialble %s" % tasks)
+        self.assertEqual(tasks, 1, "Tasks available %s" % tasks)
 
         hits = self.binaries.snapctl.task_hits(task_id)
         fails = self.binaries.snapctl.task_fails(task_id)
@@ -42,13 +42,13 @@ def test_psutil_collector_plugin(self):
         stopped = self.binaries.snapctl.stop_task(task_id)
         self.assertTrue(stopped, "Task stopped")
         tasks = self.binaries.snapctl.list_tasks()
-        self.assertEqual(tasks, 1, "Tasks avaialble %s" % tasks)
+        self.assertEqual(tasks, 1, "Tasks available %s" % tasks)
 
         self.binaries.snapctl.unload_plugin("collector", "psutil", "6")
         metrics = self.binaries.snapctl.list_metrics()
         plugins = self.binaries.snapctl.list_plugins()
         self.assertEqual(metrics, 0, "Metrics available %s" % metrics)
-        self.assertEqual(plugins, 0, "Plugins available %s" % plugins)
+        self.assertEqual(plugins, 1, "Plugins available %s" % plugins)
 
         self.assertEqual(len(self.binaries.snapd.errors), 0, "Errors found during snapd execution")