diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/runtime/context.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 0294003fc7..a7f3823996 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py | |||
@@ -112,12 +112,9 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): | |||
112 | # XXX: Don't base your targets on this code it will be refactored | 112 | # XXX: Don't base your targets on this code it will be refactored |
113 | # in the near future. | 113 | # in the near future. |
114 | # Custom target module loading | 114 | # Custom target module loading |
115 | try: | 115 | target_modules_path = kwargs.get('target_modules_path', '') |
116 | target_modules_path = kwargs.get('target_modules_path', '') | 116 | controller = OERuntimeTestContextExecutor.getControllerModule(target_type, target_modules_path) |
117 | controller = OERuntimeTestContextExecutor.getControllerModule(target_type, target_modules_path) | 117 | target = controller(logger, target_ip, server_ip, **kwargs) |
118 | target = controller(logger, target_ip, server_ip, **kwargs) | ||
119 | except ImportError as e: | ||
120 | raise TypeError("Failed to import %s from available controller modules" % target_type) | ||
121 | 118 | ||
122 | return target | 119 | return target |
123 | 120 | ||
@@ -173,10 +170,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): | |||
173 | def _loadControllerFromModule(target, modulename): | 170 | def _loadControllerFromModule(target, modulename): |
174 | obj = None | 171 | obj = None |
175 | # import module, allowing it to raise import exception | 172 | # import module, allowing it to raise import exception |
176 | try: | 173 | module = __import__(modulename, globals(), locals(), [target]) |
177 | module = __import__(modulename, globals(), locals(), [target]) | ||
178 | except Exception as e: | ||
179 | return obj | ||
180 | # look for target class in the module, catching any exceptions as it | 174 | # look for target class in the module, catching any exceptions as it |
181 | # is valid that a module may not have the target class. | 175 | # is valid that a module may not have the target class. |
182 | try: | 176 | try: |