[asterisk-commits] test runner.py: Only load global test modules when global co... (testsuite[master])

[SVN commits to the Asterisk project]

Anonymous Coward #1000019 has submitted this change and it was merged.

Change subject: test_runner.py: Only load global test modules when global config exists.
......................................................................


test_runner.py: Only load global test modules when global config exists.

Change-Id: I8a5f5a7fc6a438980f505f6e42c3c788bf587e83
---
M lib/python/asterisk/test_runner.py
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Mark Michelson: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/lib/python/asterisk/test_runner.py b/lib/python/asterisk/test_runner.py
index e940fb9..6d4a583 100755
--- a/lib/python/asterisk/test_runner.py
+++ b/lib/python/asterisk/test_runner.py
@@ -320,7 +320,8 @@
     load_test_modules(test_config, test_object, ast_version)
 
     # Load global modules as well
-    load_test_modules(test_object.global_config.config, test_object, ast_version)
+    if test_object.global_config.config:
+        load_test_modules(test_object.global_config.config, test_object, ast_version)
 
     # Kick off the twisted reactor
     reactor.run()

-- 
To view, visit https://gerrit.asterisk.org/2134
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a5f5a7fc6a438980f505f6e42c3c788bf587e83
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>