diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2017-06-30 14:23:03 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2017-06-30 14:23:03 +0900 |
| commit | a991fed7e4faa485dc67daf50ba64fe01f83415d (patch) | |
| tree | a600daa350a36c1fdc7776c111575bef56f78627 /run_tests.sh | |
| parent | a67ed2858417b9d795460f05126c01fb0cd344f9 (diff) | |
Revert "tests: Separate test files from Ryu module"
This reverts commit a67ed2858417b9d795460f05126c01fb0cd344f9.
The commit breaks OpenStack neutron dynamic routing.
Diffstat (limited to 'run_tests.sh')
| -rwxr-xr-x | run_tests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.sh b/run_tests.sh index 2f448dce..1ab8aea7 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -90,7 +90,7 @@ run_tests() { run_pylint() { echo "Running pylint ..." PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable" - PYLINT_INCLUDE="ryu bin/ryu bin/ryu-manager tests/integrated tests/packet_data_generator3 tests/unit" + PYLINT_INCLUDE="ryu bin/ryu bin/ryu-manager ryu/tests/bin/ryu-client" export PYTHONPATH=$PYTHONPATH:.ryu PYLINT_LOG=pylint.log @@ -115,11 +115,11 @@ run_pep8() { run_integrated() { echo "Running integrated test ..." - INTEGRATED_TEST_RUNNER="./tests/integrated/run_tests_with_ovs12.py" + INTEGRATED_TEST_RUNNER="./ryu/tests/integrated/run_tests_with_ovs12.py" sudo PYTHONPATH=. nosetests -s $INTEGRATED_TEST_RUNNER } #NOSETESTS="nosetests $noseopts $noseargs" -NOSETESTS="${PYTHON} ./tests/run_tests.py $noseopts $noseargs" +NOSETESTS="${PYTHON} ./ryu/tests/run_tests.py $noseopts $noseargs" #if [ -n "$PLUGIN_DIR" ] #then |