summaryrefslogtreecommitdiffstats
path: root/tools/run_tests.sh
diff options
context:
space:
mode:
authorEmma Foley <emma.l.foley@intel.com>2017-11-29 22:18:55 +0000
committerEmma Foley <emma.l.foley@intel.com>2018-01-11 14:04:15 +0000
commit5fcde48fcbac8840e128ebadb8acc563e4f3dc7b (patch)
treed27e857e3296500916c67f643316a6271f392f1f /tools/run_tests.sh
parentb1225dbbc53723741757810d3283258f157e20e4 (diff)
Run tests in yardstick/tests/
* Edit .testr.conf and tools/run_tests.sh * Run functional and unit tests in tests/ and yardstick/tests/ * Add yardstick/tests/unit/__init__.py and yardstick/tests/__init__.py * Update pylintrc rules to disable: * missing-docstring * fixme * protected-access Test will run in both tests/ and yardstick/tests/ initially Change-Id: Iccd0df0d1b85b5d08f7faa56669bc32687925f7e JIRA: YARDSTICK-837 Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'tools/run_tests.sh')
-rwxr-xr-xtools/run_tests.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index f253327e5..ddb5e55af 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -29,8 +29,10 @@ run_tests() {
echo "Running unittest ... "
if [ $FILE_OPTION == "f" ]; then
python -m unittest discover -v -s tests/unit > $logfile 2>&1
+ python -m unittest discover -v -s yardstick/tests/unit >> $logfile 2>&1
else
python -m unittest discover -v -s tests/unit
+ python -m unittest discover -v -s yardstick/tests/unit
fi
if [ $? -ne 0 ]; then
@@ -53,7 +55,8 @@ run_coverage() {
run_functional_test() {
mkdir -p .testrepository
- python -m subunit.run discover tests/functional > .testrepository/subunit.log
+ python -m subunit.run discover yardstick/tests/functional > .testrepository/subunit.log
+ python -m subunit.run discover tests/functional >> .testrepository/subunit.log
subunit2pyunit < .testrepository/subunit.log
EXIT_CODE=$?