From f01e1496ba4c520b011663b1ff634db7a668a383 Mon Sep 17 00:00:00 2001
From: Emma Foley <emma.l.foley@intel.com>
Date: Tue, 7 Nov 2017 21:04:08 +0000
Subject: Move test scripts to tools/

Move the scripts that tox uses for running tests
to the tools/ directory:
* run_tests.sh -> tools/run_tests.sh
* tests/ci/cover.{sh,awk} -> tools/

JIRA: YARDSTICK-837
Change-Id: I817c9e5f58c06b45f1de3f369318f4bb24168677
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
---
 run_tests.sh       |  85 -------------------------------------
 tests/ci/cover.awk |  25 -----------
 tests/ci/cover.sh  | 121 -----------------------------------------------------
 tools/cover.awk    |  25 +++++++++++
 tools/cover.sh     | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/run_tests.sh |  85 +++++++++++++++++++++++++++++++++++++
 tox.ini            |   6 +--
 7 files changed, 234 insertions(+), 234 deletions(-)
 delete mode 100755 run_tests.sh
 delete mode 100644 tests/ci/cover.awk
 delete mode 100644 tests/ci/cover.sh
 create mode 100644 tools/cover.awk
 create mode 100644 tools/cover.sh
 create mode 100755 tools/run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
deleted file mode 100755
index dda760218..000000000
--- a/run_tests.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Run yardstick's unit, coverage, functional test
-
-getopts ":f" FILE_OPTION
-opts=$@ # get other args
-
-# don't write .pyc files this can cause odd unittest results
-export PYTHONDONTWRITEBYTECODE=1
-
-PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )"
-export PY_VER
-
-COVER_DIR_NAME="./tests/ci/"
-export COVER_DIR_NAME
-
-run_tests() {
-    echo "Get external libs needed for unit test"
-
-    echo "Running unittest ... "
-    if [ $FILE_OPTION == "f" ]; then
-        python -m unittest discover -v -s tests/unit > $logfile 2>&1
-    else
-        python -m unittest discover -v -s tests/unit
-    fi
-
-    if [ $? -ne 0 ]; then
-        if [ $FILE_OPTION == "f" ]; then
-            echo "FAILED, results in $logfile"
-        fi
-        exit 1
-    else
-        if [ $FILE_OPTION == "f" ]; then
-            echo "OK, results in $logfile"
-        fi
-    fi
-}
-
-run_coverage() {
-    source $COVER_DIR_NAME/cover.sh
-    run_coverage_test
-}
-
-run_functional_test() {
-
-    mkdir -p .testrepository
-    python -m subunit.run discover tests/functional > .testrepository/subunit.log
-
-    subunit2pyunit < .testrepository/subunit.log
-    EXIT_CODE=$?
-    subunit-stats < .testrepository/subunit.log
-
-    if [ $EXIT_CODE -ne 0 ]; then
-        exit 1
-    else
-        echo "OK"
-    fi
-}
-
-if [[ $opts =~ "--unit" ]]; then
-    run_tests
-fi
-
-if [[ $opts =~ "--coverage" ]]; then
-    run_coverage
-fi
-
-if [[ $opts =~ "--functional" ]]; then
-    run_functional_test
-fi
-
-if [[ -z $opts ]]; then
-    echo "No tests to run!!"
-    echo "Usage: run_tests.sh [--unit] [--coverage] [--functional]"
-    exit 1
-fi
diff --git a/tests/ci/cover.awk b/tests/ci/cover.awk
deleted file mode 100644
index e4bb816dc..000000000
--- a/tests/ci/cover.awk
+++ /dev/null
@@ -1,25 +0,0 @@
-BEGIN{
-    template = "%6s   %-75s\n"
-    printf template, "Delta", "Module Path"
-}
-
-/^-/{
-    s = substr($1, 2)
-    x[s] = $3;
-};
-
-/^+/{
-    s = substr($1, 2)
-    d = $3
-    if (s in x)
-       d = d - x[s]
-    y[s" "d] = d
-}
-
-END{
-    asorti(y, z1, "@val_num_asc")
-    for (i=1; i <= length(z1); i++){
-        split(z1[i], z2, " ")
-        printf template, z2[2], z2[1]
-    }
-}
diff --git a/tests/ci/cover.sh b/tests/ci/cover.sh
deleted file mode 100644
index 780a85a22..000000000
--- a/tests/ci/cover.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright 2015: Mirantis Inc.
-# All Rights Reserved.
-#
-#    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.
-# yardstick comment: this is a modified copy of
-# rally/tests/ci/cover.sh
-##############################################################################
-
-if [[ -n $COVER_DIR_NAME ]]; then
-    :
-elif [[ -n $_ ]]; then
-    COVER_DIR_NAME=$( dirname $_ )
-else
-    COVER_DIR_NAME=$( dirname $0 )
-fi
-
-show_diff () {
-    diff -U 0 $1 $2 | awk -f $COVER_DIR_NAME/cover.awk
-}
-
-run_coverage_test() {
-
-    ALLOWED_EXTRA_MISSING=10
-    # enable debugging
-    set -x
-
-    # Stash uncommitted changes, checkout master and save coverage report
-    uncommited=$(git status --porcelain | grep -v "^??")
-    [[ -n ${uncommited} ]] && git stash > /dev/null
-    git checkout HEAD^
-
-    baseline_report=$(mktemp -t yardstick_coverageXXXXXXX)
-    ls -l .testrepository
-
-    # workaround 'db type could not be determined' bug
-    # https://bugs.launchpad.net/testrepository/+bug/1229445
-    rm -rf .testrepository
-    find . -type f -name "*.pyc" -delete
-
-    #python setup.py testr --coverage --testr-args=""
-    python setup.py testr --coverage --slowest --testr-args="$*"
-    testr failing
-    coverage report > ${baseline_report}
-
-    # debug awk
-    tail -1 ${baseline_report}
-    baseline_missing=$(awk 'END { if (int($3) > 0) print $3 }' ${baseline_report})
-
-    if [[ -z $baseline_missing ]]; then
-        echo "Failed to determine baseline missing"
-        exit 1
-    fi
-
-    # Checkout back and unstash uncommitted changes (if any)
-    git checkout -
-    [[ -n ${uncommited} ]] && git stash pop > /dev/null
-
-    # Generate and save coverage report
-    current_report=$(mktemp -t yardstick_coverageXXXXXXX)
-    ls -l .testrepository
-
-    # workaround 'db type could not be determined' bug
-    # https://bugs.launchpad.net/testrepository/+bug/1229445
-    rm -rf .testrepository
-    find . -type f -name "*.pyc" -delete
-
-    #python setup.py testr --coverage --testr-args=""
-    python setup.py testr --coverage --slowest --testr-args="$*"
-    testr failing
-    coverage report > ${current_report}
-
-    rm -rf cover-$PY_VER
-    coverage html -d cover-$PY_VER
-
-    # debug awk
-    tail -1 ${current_report}
-    current_missing=$(awk 'END { if (int($3) > 0) print $3 }' ${current_report})
-
-    if [[ -z $current_missing ]]; then
-        echo "Failed to determine current missing"
-        exit 1
-    fi
-
-    # Show coverage details
-    new_missing=$((current_missing - baseline_missing))
-
-    echo "Missing lines allowed to introduce : ${ALLOWED_EXTRA_MISSING}"
-    echo "Missing lines introduced           : ${new_missing}"
-    echo "Missing lines in master            : ${baseline_missing}"
-    echo "Missing lines in proposed change   : ${current_missing}"
-
-    if [[ ${new_missing} -gt ${ALLOWED_EXTRA_MISSING} ]];
-    then
-        show_diff ${baseline_report} ${current_report}
-        echo "Please write more unit tests, we should keep our test coverage :( "
-        rm ${baseline_report} ${current_report}
-        exit 1
-
-    elif [[ ${new_missing} -gt 0 ]];
-    then
-        show_diff ${baseline_report} ${current_report}
-        echo "I believe you can cover all your code with 100% coverage!"
-
-    else
-        echo "Thank you! You are awesome! Keep writing unit tests! :)"
-    fi
-
-    rm ${baseline_report} ${current_report}
-}
diff --git a/tools/cover.awk b/tools/cover.awk
new file mode 100644
index 000000000..e4bb816dc
--- /dev/null
+++ b/tools/cover.awk
@@ -0,0 +1,25 @@
+BEGIN{
+    template = "%6s   %-75s\n"
+    printf template, "Delta", "Module Path"
+}
+
+/^-/{
+    s = substr($1, 2)
+    x[s] = $3;
+};
+
+/^+/{
+    s = substr($1, 2)
+    d = $3
+    if (s in x)
+       d = d - x[s]
+    y[s" "d] = d
+}
+
+END{
+    asorti(y, z1, "@val_num_asc")
+    for (i=1; i <= length(z1); i++){
+        split(z1[i], z2, " ")
+        printf template, z2[2], z2[1]
+    }
+}
diff --git a/tools/cover.sh b/tools/cover.sh
new file mode 100644
index 000000000..780a85a22
--- /dev/null
+++ b/tools/cover.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+##############################################################################
+# Copyright 2015: Mirantis Inc.
+# All Rights Reserved.
+#
+#    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.
+# yardstick comment: this is a modified copy of
+# rally/tests/ci/cover.sh
+##############################################################################
+
+if [[ -n $COVER_DIR_NAME ]]; then
+    :
+elif [[ -n $_ ]]; then
+    COVER_DIR_NAME=$( dirname $_ )
+else
+    COVER_DIR_NAME=$( dirname $0 )
+fi
+
+show_diff () {
+    diff -U 0 $1 $2 | awk -f $COVER_DIR_NAME/cover.awk
+}
+
+run_coverage_test() {
+
+    ALLOWED_EXTRA_MISSING=10
+    # enable debugging
+    set -x
+
+    # Stash uncommitted changes, checkout master and save coverage report
+    uncommited=$(git status --porcelain | grep -v "^??")
+    [[ -n ${uncommited} ]] && git stash > /dev/null
+    git checkout HEAD^
+
+    baseline_report=$(mktemp -t yardstick_coverageXXXXXXX)
+    ls -l .testrepository
+
+    # workaround 'db type could not be determined' bug
+    # https://bugs.launchpad.net/testrepository/+bug/1229445
+    rm -rf .testrepository
+    find . -type f -name "*.pyc" -delete
+
+    #python setup.py testr --coverage --testr-args=""
+    python setup.py testr --coverage --slowest --testr-args="$*"
+    testr failing
+    coverage report > ${baseline_report}
+
+    # debug awk
+    tail -1 ${baseline_report}
+    baseline_missing=$(awk 'END { if (int($3) > 0) print $3 }' ${baseline_report})
+
+    if [[ -z $baseline_missing ]]; then
+        echo "Failed to determine baseline missing"
+        exit 1
+    fi
+
+    # Checkout back and unstash uncommitted changes (if any)
+    git checkout -
+    [[ -n ${uncommited} ]] && git stash pop > /dev/null
+
+    # Generate and save coverage report
+    current_report=$(mktemp -t yardstick_coverageXXXXXXX)
+    ls -l .testrepository
+
+    # workaround 'db type could not be determined' bug
+    # https://bugs.launchpad.net/testrepository/+bug/1229445
+    rm -rf .testrepository
+    find . -type f -name "*.pyc" -delete
+
+    #python setup.py testr --coverage --testr-args=""
+    python setup.py testr --coverage --slowest --testr-args="$*"
+    testr failing
+    coverage report > ${current_report}
+
+    rm -rf cover-$PY_VER
+    coverage html -d cover-$PY_VER
+
+    # debug awk
+    tail -1 ${current_report}
+    current_missing=$(awk 'END { if (int($3) > 0) print $3 }' ${current_report})
+
+    if [[ -z $current_missing ]]; then
+        echo "Failed to determine current missing"
+        exit 1
+    fi
+
+    # Show coverage details
+    new_missing=$((current_missing - baseline_missing))
+
+    echo "Missing lines allowed to introduce : ${ALLOWED_EXTRA_MISSING}"
+    echo "Missing lines introduced           : ${new_missing}"
+    echo "Missing lines in master            : ${baseline_missing}"
+    echo "Missing lines in proposed change   : ${current_missing}"
+
+    if [[ ${new_missing} -gt ${ALLOWED_EXTRA_MISSING} ]];
+    then
+        show_diff ${baseline_report} ${current_report}
+        echo "Please write more unit tests, we should keep our test coverage :( "
+        rm ${baseline_report} ${current_report}
+        exit 1
+
+    elif [[ ${new_missing} -gt 0 ]];
+    then
+        show_diff ${baseline_report} ${current_report}
+        echo "I believe you can cover all your code with 100% coverage!"
+
+    else
+        echo "Thank you! You are awesome! Keep writing unit tests! :)"
+    fi
+
+    rm ${baseline_report} ${current_report}
+}
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
new file mode 100755
index 000000000..f253327e5
--- /dev/null
+++ b/tools/run_tests.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# Run yardstick's unit, coverage, functional test
+
+getopts ":f" FILE_OPTION
+opts=$@ # get other args
+
+# don't write .pyc files this can cause odd unittest results
+export PYTHONDONTWRITEBYTECODE=1
+
+PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )"
+export PY_VER
+
+COVER_DIR_NAME="./tools/"
+export COVER_DIR_NAME
+
+run_tests() {
+    echo "Get external libs needed for unit test"
+
+    echo "Running unittest ... "
+    if [ $FILE_OPTION == "f" ]; then
+        python -m unittest discover -v -s tests/unit > $logfile 2>&1
+    else
+        python -m unittest discover -v -s tests/unit
+    fi
+
+    if [ $? -ne 0 ]; then
+        if [ $FILE_OPTION == "f" ]; then
+            echo "FAILED, results in $logfile"
+        fi
+        exit 1
+    else
+        if [ $FILE_OPTION == "f" ]; then
+            echo "OK, results in $logfile"
+        fi
+    fi
+}
+
+run_coverage() {
+    source $COVER_DIR_NAME/cover.sh
+    run_coverage_test
+}
+
+run_functional_test() {
+
+    mkdir -p .testrepository
+    python -m subunit.run discover tests/functional > .testrepository/subunit.log
+
+    subunit2pyunit < .testrepository/subunit.log
+    EXIT_CODE=$?
+    subunit-stats < .testrepository/subunit.log
+
+    if [ $EXIT_CODE -ne 0 ]; then
+        exit 1
+    else
+        echo "OK"
+    fi
+}
+
+if [[ $opts =~ "--unit" ]]; then
+    run_tests
+fi
+
+if [[ $opts =~ "--coverage" ]]; then
+    run_coverage
+fi
+
+if [[ $opts =~ "--functional" ]]; then
+    run_functional_test
+fi
+
+if [[ -z $opts ]]; then
+    echo "No tests to run!!"
+    echo "Usage: run_tests.sh [--unit] [--coverage] [--functional]"
+    exit 1
+fi
diff --git a/tox.ini b/tox.ini
index ed2fd4a7d..9a82878b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ whitelist_externals = /bin/bash
 
 [testenv:py27]
 commands =
-  /bin/bash ./run_tests.sh --unit
+  /bin/bash {toxinidir}/tools/run_tests.sh --unit
 
 [testenv:py3]
 basepython = python3
@@ -32,11 +32,11 @@ commands =
 [testenv:coverage]
 basepython = python3
 commands =
-  /bin/bash ./run_tests.sh --coverage
+  /bin/bash {toxinidir}/tools/run_tests.sh --coverage
 
 [testenv:functional]
 commands =
-  /bin/bash ./run_tests.sh --functional
+  /bin/bash {toxinidir}/tools/run_tests.sh --functional
 
 [testenv:functional-py3]
 basepython = python3
-- 
cgit 1.2.3-korg