summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Pisarski <s.pisarski@cablelabs.com>2017-04-14 13:46:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-14 13:46:39 +0000
commit02fa5b4fcc78e8ea7cb34acd1175ede6af48df00 (patch)
tree9934b445b5297132bf71e80772e681834561d694
parent6c5dc1025d91ccb9119635d86f7d0f1e64280b1e (diff)
parent2d0c7b7b64c17f25c94189efce66842f15743e0d (diff)
Merge "Run all test suites when none chosen."
-rw-r--r--snaps/test_runner.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/snaps/test_runner.py b/snaps/test_runner.py
index 00b1b25..143882b 100644
--- a/snaps/test_runner.py
+++ b/snaps/test_runner.py
@@ -94,11 +94,18 @@ def main(arguments):
suite = None
if arguments.env and arguments.ext_net:
+ unit = arguments.include_unit != ARG_NOT_SET
+ connection = arguments.include_connection != ARG_NOT_SET
+ api = arguments.include_api != ARG_NOT_SET
+ integration = arguments.include_integration != ARG_NOT_SET
+ if not unit and not connection and not api and not integration:
+ unit = True
+ connection = True
+ api = True
+ integration = True
+
suite = __create_test_suite(arguments.env, arguments.ext_net, arguments.proxy, arguments.ssh_proxy_cmd,
- arguments.include_unit != ARG_NOT_SET,
- arguments.include_connection != ARG_NOT_SET,
- arguments.include_api != ARG_NOT_SET,
- arguments.include_integration != ARG_NOT_SET,
+ unit, connection, api, integration,
flavor_metadata,
arguments.use_keystone != ARG_NOT_SET,
arguments.floating_ips != ARG_NOT_SET, log_level)