Make integration for LC Python 2 and 3 compatible

Signed-off-by: Martin Styk <mart.styk@gmail.com>

Author: StykMartin

IntegrationTests/src/bkr/inttest/labcontroller/__init__.py

@@ -8,13 +8,13 @@
 import os
 import shutil
 import signal
-from socket import gethostname
-from urlparse import urlparse, urlunparse
 from bkr.labcontroller.config import load_conf, get_conf
 from turbogears.database import session
 from bkr.server.model import LabController, Watchdog, Recipe, RecipeSet, \
         System, SystemStatus
 from bkr.inttest import data_setup, Process, DatabaseTestCase
+
+
 log = logging.getLogger(__name__)
 
 # XXX this should be inside setup_package, but lots of code in

IntegrationTests/src/bkr/inttest/labcontroller/test_distro_import.py

@@ -9,13 +9,15 @@
 import subprocess
 import json
 import pkg_resources
-import urlparse
-from copy import copy, deepcopy
+from copy import deepcopy
 from bkr.inttest import Process
 from bkr.inttest.labcontroller import LabControllerTestCase
 from bkr.server.model import OSMajor
 from turbogears.database import session
 
+from six.moves import urllib
+
+
 _current_dir = os.path.dirname(__file__)
 _compose_test_dir = pkg_resources.resource_filename('bkr.inttest.labcontroller', 'compose_layout')
 _git_root_dir = os.path.join(_current_dir, '..', '..', '..', '..', '..')
@@ -1175,7 +1177,7 @@ def setUp(self):
                     u"type": u"initrd"
                 }
             ],
-            u"kernel_options": u" inst.stage2={}".format(urlparse.urljoin(
+            u"kernel_options": u" inst.stage2={}".format(urllib.parse.urljoin(
                 self.distro_url, u'RHVH4/RHVH-4.3-20200323.0/compose/RHVH/x86_64/os')),
             u"kernel_options_post": None,
             u"ks_meta": u" autopart_type=thinp liveimg=Packages/redhat-virtualization-host-image-update-1.0.0-1.noarch.rpm ks_keyword=inst.ks",
@@ -1199,7 +1201,7 @@ def setUp(self):
             ],
             u"tree_build_time": u"1584961599",
             u"urls": [
-                u"{}".format(urlparse.urljoin(self.distro_url, u'RHVH4/RHVH-4.3-20200323.0/compose/RHVH/x86_64/os/'))
+                u"{}".format(urllib.parse.urljoin(self.distro_url, u'RHVH4/RHVH-4.3-20200323.0/compose/RHVH/x86_64/os/'))
             ],
             u"variant": u"RHVH"
         }
@@ -1208,7 +1210,7 @@ def _run_import(self, import_args):
         p = subprocess.Popen(import_args,
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE,
-                             env=dict(os.environ.items() + [('PYTHONUNBUFFERED', '1')]))
+                             env=dict(list(os.environ.items()) + [('PYTHONUNBUFFERED', '1')]))
         stdout, stderr = p.communicate()
         if p.returncode:
             raise TreeImportError(import_args, p.returncode, stderr)
@@ -1220,7 +1222,7 @@ def dry_run_import_trees(self, additional_import_args):
         trees, stderr = self._run_import(
                 ['python', _command, '--debug', '--json', '--dry-run']
                 + additional_import_args)
-        print stderr
+        print(stderr)
         # check logging is working correctly
         self.assertIn('Dry Run only', stderr)
         self.assertIn('Attempting to import: ', stderr)
@@ -1559,6 +1561,6 @@ def test_rhel8_partner_import(self):
         self.assertItemsEqual(trees, [self.x86_64_rhel8_partner])
 
     def test_rhvh43_import(self):
-        trees = self.dry_run_import_trees(['{}'.format(urlparse.urljoin(self.distro_url,
+        trees = self.dry_run_import_trees(['{}'.format(urllib.parse.urljoin(self.distro_url,
                                                                         'RHVH4/RHVH-4.3-20200323.0/compose'))])
         self.assertItemsEqual(trees, [self.x86_64_rhvh43])

IntegrationTests/src/bkr/inttest/labcontroller/test_provision.py

@@ -9,14 +9,16 @@
 import pkg_resources
 from turbogears.database import session
 from unittest import SkipTest, TestCase
-from xmlrpclib import _Method
 from bkr.server.model import PowerType, CommandStatus, System, User, SystemStatus
 from bkr.labcontroller.config import get_conf
 from bkr.labcontroller.provision import CommandQueuePoller
 from bkr.inttest import data_setup, Process
 from bkr.inttest.assertions import wait_for_condition
 from bkr.inttest.labcontroller import LabControllerTestCase, processes, daemons_running_externally
 
+from six.moves.xmlrpc_client import _Method
+
+
 log = logging.getLogger(__name__)