summaryrefslogtreecommitdiff
path: root/run_tests.sh
diff options
context:
space:
mode:
authorMatthias Runge <mrunge@redhat.com>2014-03-07 13:44:16 +0100
committerMatthias Runge <mrunge@redhat.com>2014-03-12 09:52:08 +0100
commit0ed2b041861acd6b2b74affc0aef4eb68f5a9706 (patch)
tree8aaa0fd441e0922a63b6259d1fa5797aa75335af /run_tests.sh
parentdbd4b413f9c90300aaa6b6a17ed16d6feca48324 (diff)
downloadhorizon-0ed2b041861acd6b2b74affc0aef4eb68f5a9706.tar.gz
Fix selenium imports on tests
tests require selenium to be installed, no matter if integration tests or selenium tests are executed or not. Change-Id: Ie55d64c19b00b5b22f62948d4a24a3f322082b0c Closes-Bug: #1289270
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/run_tests.sh b/run_tests.sh
index a0c10cf1a..6d5b118d9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -296,6 +296,10 @@ function run_tests {
export SKIP_UNITTESTS=1
fi
+ if [ $with_selenium -eq 0 -a $integration -eq 0 ]; then
+ testopts="$testopts --exclude-dir=openstack_dashboard/test/integration_tests"
+ fi
+
if [ -z "$testargs" ]; then
run_tests_all
else