Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate OTN E2E functional tests to RFC8040 step 3
[transportpce.git]
/
tests
/
launch_tests.sh
diff --git
a/tests/launch_tests.sh
b/tests/launch_tests.sh
index f1951c2205bf83d9186a62c7c77060df8e3bb3c9..54d1cd1033eb34aca16125e960b430bfd71d2718 100755
(executable)
--- a/
tests/launch_tests.sh
+++ b/
tests/launch_tests.sh
@@
-1,7
+1,8
@@
#!/bin/sh
#!/bin/sh
-if [ "$USE_LIGHTY" != "True" ]; then
- ./build_karaf_for_tests.sh
+if [ -n "$USE_ODL_ALT_KARAF_ENV" ]; then
+ echo "using environment variables from $USE_ODL_ALT_KARAF_ENV"
+ . $USE_ODL_ALT_KARAF_ENV
fi
for arg in $@; do
fi
for arg in $@; do
@@
-30,7
+31,7
@@
else
done
fi
if [ -z "$LAUNCHER" ]; then
done
fi
if [ -z "$LAUNCHER" ]; then
- LAUNCHER="
nosetests --with-xunit
";
+ LAUNCHER="
python3 -m pytest -q
";
fi
for script in $scriptlist; do
fi
for script in $scriptlist; do