Merge pull request #5 from AutoModality/AM-415/rostests

Added support for single testsuite failure check

Author: Aaron Roller

detection.sh

@@ -10,23 +10,34 @@ file_or_folder="$1"
 # uses simple grep to look for failures="0" and errors="0"
 
 
+find_fail(){
+    target=$1
+    file=$2
+    suite_line=$(cat "$file" | grep "$target")
+    if echo "$suite_line" | grep "failures=\"0\"";then
+        if echo "$suite_line" | grep "errors=\"0\"";then
+            return 0
+        else
+            echo "Error found in $file: $suite_line"
+            return 1
+        fi
+    else
+        echo "Failure found in $file: $suite_line"
+        return 1
+    fi
+}
 suite_success(){
     file="$1"
     # look for 0 failures and errors
     # grep reports non zero code if anything but zero failures/errors
-    if cat "$file" | grep "<testsuites";then
-        suite_line=$(cat "$file" | grep "<testsuites")
-        if echo "$suite_line" | grep "failures=\"0\"";then
-            if echo "$suite_line" | grep "errors=\"0\"";then
-                return 0
-            else
-                echo "Error found in $file: $suite_line"
-                return 1
-            fi
-        else
-            echo "Failure found in $file: $suite_line"
-            return 1
-        fi
+    plural="<testsuites "
+    singular="<testsuite "
+    if cat "$file" | grep "$plural";then
+        find_fail $plural $file
+        return $?
+    elif cat "$file" | grep "$singular";then
+        find_fail $singular $file
+        return $?
     else
         echo "Skipping file without suite: $file"
     fi

test/all.sh

@@ -6,7 +6,10 @@ set -e
 
 test/one.sh test/success_fixture.xml 0
 test/one.sh test/failure_fixture.xml 1
+test/one.sh test/singular_testsuite_success_fixture.xml 0
+test/one.sh test/singular_testsuite_failure_fixture.xml 1
 test/one.sh test/error_fixture.xml 1
+
 test/one.sh test 1
 test/one.sh test/success 0
 test/one.sh test/failure 1

test/singular_testsuite_failure_fixture.xml

@@ -0,0 +1,35 @@
+<testsuite errors="0" failures="1" name="unittest.suite.TestSuite" tests="1" time="0.114"><testcase classname="rostest.runner.RosTest" name="testsuper_status" time="0.1142"><failure type="AssertionError">Test Fixture Nodes ['am_super'] failed to launch
+  File "/usr/lib/python2.7/unittest/case.py", line 329, in run
+    testMethod()
+  File "/opt/ros/melodic/lib/python2.7/dist-packages/rostest/runner.py", line 121, in fn
+    self.assert_(not failed, "Test Fixture Nodes %s failed to launch"%failed)
+  File "/usr/lib/python2.7/unittest/case.py", line 422, in assertTrue
+    raise self.failureException(msg)
+</failure></testcase><system-out>&lt;![CDATA[
+[ROSTEST]setup[/home/developer/catkin_ws/src/rostest/am_super_status.test] run_id[13387f10-ca87-11ea-ae12-0242ac110002] starting
+&amp;#x001B;[1mstarted roslaunch server http://94f83af5cd1d:36301/&amp;#x001B;[0m
+
+SUMMARY
+========
+
+PARAMETERS
+ * /rosdistro: melodic
+ * /rosversion: 1.14.5
+
+NODES
+  /
+    am_super (am_super/am_super)
+
+[ROSTEST]setup[/home/developer/catkin_ws/src/rostest/am_super_status.test] run_id[13387f10-ca87-11ea-ae12-0242ac110002] done
+[ROSTEST]Running test [super_status]
+&amp;#x001B;[1mROS_MASTER_URI=http://94f83af5cd1d:46481/&amp;#x001B;[0m
+&amp;#x001B;[1msetting /run_id to 13387f10-ca87-11ea-ae12-0242ac110002&amp;#x001B;[0m
+[ROSTEST]tearDown[/home/developer/catkin_ws/src/rostest/am_super_status.test]
+shutting down processing monitor...
+... shutting down processing monitor complete
+[ROSTEST]rostest teardown /home/developer/catkin_ws/src/rostest/am_super_status.test complete
+
+]]&gt;</system-out><system-err>&lt;![CDATA[
+&amp;#x001B;[31mERROR: cannot launch node of type [am_super/am_super]: Cannot locate node of type [am_super] in package [am_super]. Make sure file exists in package path and permission is set to executable (chmod +x)&amp;#x001B;[0m
+
+]]&gt;</system-err></testsuite>

test/singular_testsuite_success_fixture copy.xml

@@ -0,0 +1,2 @@
+<testsuite errors="0" failures="0" name="unittest.suite.TestSuite" tests="1" time="0.114"><testcase classname="rostest.runner.RosTest" name="testsuper_status" time="0.1142">
+ </testsuite>