ipatests: Use pytest-beakerlib

The plugin for BeakerLib integration was split into a separate project.
If BeakerLib integration is desired, python-pytest-beakerlib shoule be
installed separately.
The IPA-specific beakerlib integration only sets up logging to BeakerLib,
if the plugin is active.

Reviewed-By: Tomas Babej <tbabej@redhat.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/ipatests/ipa-test-task b/ipatests/ipa-test-task
index d89af841d..8c9ab082f 100755
--- a/ipatests/ipa-test-task
+++ b/ipatests/ipa-test-task
@@ -28,9 +28,13 @@ from ipapython.ipa_log_manager import log_mgr, standard_logging_setup
 from ipatests.test_integration import config
 from ipatests.test_integration import tasks
 from ipatests.test_integration.host import Host
-from ipatests.pytest_plugins.beakerlib import BeakerLibProcess
 from ipatests.pytest_plugins.integration import collect_logs
 
+try:
+    from pytest_beakerlib import BeakerLibProcess
+except ImportError:
+    BeakerLibProcess = None
+
 
 log = log_mgr.get_logger(__name__)
 
@@ -245,8 +249,8 @@ class TaskRunner(object):
         return parser
 
     def main(self, argv):
-
-        args = self.get_parser().parse_args(argv)
+        parser = self.get_parser()
+        args = parser.parse_args(argv)
         self.config = config.Config.from_env(os.environ)
         if not self.config:
             raise EnvironmentError('Multihost environment not configured')
@@ -259,6 +263,9 @@ class TaskRunner(object):
         self.collect_log = collect_log
 
         if args.with_beakerlib:
+            if BeakerLibProcess is None:
+                parser.error(
+                    'pytest_beakerlib not installed, cannot use BeakerLib')
             beakerlib_process = BeakerLibProcess()
             args.verbose = True