diff options
author | MatthewLi <matthew.lijun@huawei.com> | 2016-12-20 05:20:08 -0500 |
---|---|---|
committer | MatthewLi <matthew.lijun@huawei.com> | 2016-12-21 03:11:37 -0500 |
commit | 1124a453feb24308f58bda363c229f632cafd82f (patch) | |
tree | 41758a7569acd06b05666ea069a94aaa855046e6 /unittests | |
parent | 966c877707a58f6fe9c878c30dc25dbf065898a9 (diff) |
dovetail tool: fully tox supported
JIRA: DOVETAIL-165
1, fully tox supported
2, previous easy setup abandoned
3, CI verify job changed accordingly
4, unittest bug fix
this should merge after
https://gerrit.opnfv.org/gerrit/#/c/26297/
results see
https://etherpad.opnfv.org/p/dovetail_report
Change-Id: I52ce3999fcde7e817854e4a39f4111eef081bc78
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'unittests')
-rw-r--r-- | unittests/requirements.txt | 6 | ||||
-rwxr-xr-x | unittests/unittest.sh | 60 |
2 files changed, 0 insertions, 66 deletions
diff --git a/unittests/requirements.txt b/unittests/requirements.txt deleted file mode 100644 index 694a62b4..00000000 --- a/unittests/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -Click -coverage==4.1b2 -flake8==2.5.4 -Jinja2==2.8 -PyYAML==3.11 - diff --git a/unittests/unittest.sh b/unittests/unittest.sh deleted file mode 100755 index 215d0ebd..00000000 --- a/unittests/unittest.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -############################################################################## -# Copyright (c) 2016 OPNFV 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 flake8 -# Future, more can be added when necessary, such as coverage/functional/unit check -# of the dovetail tool - -getopts ":f" FILE_OPTION - -run_flake8() { - echo "Running flake8 ... " - logfile=unittest_results.log - if [ $FILE_OPTION == "f" ]; then - flake8 dovetail > $logfile - else - flake8 dovetail - fi - - if [ $? -ne 0 ]; then - echo "FAILED" - if [ $FILE_OPTION == "f" ]; then - echo "Results in $logfile" - fi - exit 1 - else - echo "OK" - fi -} - -run_tests() { - echo "Running unittest ..." - cd dovetail/ - 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_flake8 -run_tests |