[Fuego] [PATCH 2/3] fix expat test and add it to testplan docker

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/overlays/testplans/testplan_docker.json      | 3 +++
 engine/tests/Functional.expat/Functional.expat.spec | 5 ++++-
 engine/tests/Functional.expat/expat.sh              | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/engine/overlays/testplans/testplan_docker.json b/engine/overlays/testplans/testplan_docker.json
index f8db7d5..160f04e 100644
--- a/engine/overlays/testplans/testplan_docker.json
+++ b/engine/overlays/testplans/testplan_docker.json
@@ -56,6 +56,9 @@
             "timeout": "100m"
         },
         {
+            "testName": "Functional.expat"
+        },
+        {
             "testName": "Functional.aiostress"
         },
         {
diff --git a/engine/tests/Functional.expat/Functional.expat.spec b/engine/tests/Functional.expat/Functional.expat.spec
index 7804c78..73b32b4 100644
--- a/engine/tests/Functional.expat/Functional.expat.spec
+++ b/engine/tests/Functional.expat/Functional.expat.spec
@@ -3,6 +3,9 @@
     "success_links": {"log": "testlog.txt"},
     "fail_links": {"log": "testlog.txt"},
     "specs": {
-        "default": {}
+        "default": {
+            "subtest_count_pos" : "1768",
+            "subtest_count_neg" : "41"
+        }
     }
 }
diff --git a/engine/tests/Functional.expat/expat.sh b/engine/tests/Functional.expat/expat.sh
index 7b41cbf..5a0f4f5 100755
--- a/engine/tests/Functional.expat/expat.sh
+++ b/engine/tests/Functional.expat/expat.sh
@@ -34,11 +34,11 @@ function test_run {
 }
 
 function test_processing {
-    assert_define EXPAT_SUBTEST_COUNT_POS
-    assert_define EXPAT_SUBTEST_COUNT_NEG
+    assert_define FUNCTIONAL_EXPAT_SUBTEST_COUNT_POS
+    assert_define FUNCTIONAL_EXPAT_SUBTEST_COUNT_NEG
 
-    log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_POS "100%: Checks: 48|passed" "p"
-    log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_NEG "failed" "n"
+    log_compare "$TESTDIR" $FUNCTIONAL_EXPAT_SUBTEST_COUNT_POS "^.*\.xml passed\.$" "p"
+    log_compare "$TESTDIR" $FUNCTIONAL_EXPAT_SUBTEST_COUNT_NEG "^.*\.xml failed\.$" "n"
 }
 
 
-- 
2.7.4