summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThugutla sailakshmi <tsaila10@in.ibm.com>2019-11-19 22:47:43 +0530
committerThugutla Sai Lakshmi <tsaila10@in.ibm.com>2019-11-21 07:13:27 +0000
commit069415e671f851718796e89708fc4ebf212febb2 (patch)
tree26c25030fe2ebc530e9f12684b51e30aed861c44
parent7920fb2b80ee2671ac15033c2d0cb2599217a1e2 (diff)
fixing tox cases under engine module
Issue-ID: OPTFRA-578 Change-Id: Id7a6bf7f76900c21d1504bea674d0a4bdda51626 Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>
-rw-r--r--engine/src/tools/pretty_tox.sh35
-rw-r--r--engine/tox.ini2
2 files changed, 36 insertions, 1 deletions
diff --git a/engine/src/tools/pretty_tox.sh b/engine/src/tools/pretty_tox.sh
new file mode 100644
index 0000000..387e4d8
--- /dev/null
+++ b/engine/src/tools/pretty_tox.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# -------------------------------------------------------------------------
+# Copyright (c) 2015-2017 AT&T Intellectual Property
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# -------------------------------------------------------------------------
+#
+
+
+set -o pipefail
+
+TESTRARGS=$1
+
+# --until-failure is not compatible with --subunit see:
+#
+# https://bugs.launchpad.net/testrepository/+bug/1411804
+#
+# this work around exists until that is addressed
+if [[ "$TESTARGS" =~ "until-failure" ]]; then
+ python setup.py testr --slowest --testr-args="$TESTRARGS" | subunit2junitxml --output-to=xunit-results.xml
+else
+ python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-1to2 | subunit2junitxml --no-passthrough --forward --output-to=xunit-results.xml | subunit-trace -f
+fi
diff --git a/engine/tox.ini b/engine/tox.ini
index 4c783eb..f36eff6 100644
--- a/engine/tox.ini
+++ b/engine/tox.ini
@@ -34,7 +34,7 @@ commands =
coverage erase
find . -type f -name "*.pyc" -delete
find . -type f -name ".coverage.*" -delete
- #{toxinidir}/tools/pretty_tox.sh "{posargs}"
+ {toxinidir}/src/tools/pretty_tox.sh "{posargs}"
coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml