Merge ~kissiel/checkbox-converged:autopilot-fixes into checkbox-converged:master

[Maciej Kisielewski]

fix autopilot failures

The following two patches fix ./get-libs crashes
9b8ff32 copy trusted.gpg only if exists
39e6eb0 bump repo used to xenial

This one fixes deployment/packaging of the app.
27a776e use new pkg name for pyotherside

This one fixes autopilot on systems that have some global providers installed
(scenarios were broken, as they were too many test plans visible on the screen, and AP couldn't find the correct one)
2d08563 ignore installed providers when running autopilot

[Sylvain Pineau (sylvain-pineau)]

looks good to me, +1

review: Approve

diff --git a/get-libs b/get-libs
index 4b3e2c9..d310b66 100755
--- a/get-libs
+++ b/get-libs
@@ -113,7 +113,7 @@ def main():
         # skip downloading rest of the libs
         return
     packages = [
-        'libpython3.5', 'pyotherside', 'python3-xlsxwriter',
+        'libpython3.5', 'qml-module-io-thp-pyotherside', 'python3-xlsxwriter',
         'python3-jinja2', 'python3-markupsafe', 'python3-padme',
         'python3-requests', 'python3-urllib3', 'python3-guacamole',
         'python3-requests-oauthlib']
@@ -161,7 +161,7 @@ def main():
                 os.path.join('lib', 'py'),
                 preserve_symlinks=1)
     with tempfile.TemporaryDirectory() as tmp:
-        get_package_from_url_and_extract(uris['pyotherside'], tmp)
+        get_package_from_url_and_extract(uris['qml-module-io-thp-pyotherside'], tmp)
         src = os.path.join(
             tmp, 'usr', 'lib', 'arm-linux-gnueabihf', 'qt5', 'qml')
         dest = os.path.join('lib', 'arm-linux-gnueabihf')
diff --git a/tests/autopilot/checkbox_converged/__init__.py b/tests/autopilot/checkbox_converged/__init__.py
index c4d2027..21f62fc 100644
--- a/tests/autopilot/checkbox_converged/__init__.py
+++ b/tests/autopilot/checkbox_converged/__init__.py
@@ -183,6 +183,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
     def _launch_application_from_desktop(self):
         app_qml_source_location = self._get_app_qml_source_path()
         if os.path.exists(app_qml_source_location):
+            os.environ['PROVIDERPATH'] = ''
             self.app = self.launch_test_application(
                 base.get_qmlscene_launch_command(),
                 '-I', self._get_plainbox_qml_modules_path(),
diff --git a/utils.py b/utils.py
index 1fd65b5..149a254 100644
--- a/utils.py
+++ b/utils.py
@@ -57,8 +57,9 @@ def prepare_uris(packages):
         new_etc_apt = os.path.join(tmp, 'etc', 'apt')
         os.makedirs(new_etc_apt)
         # copy over trusted.gpg
-        shutil.copyfile('/etc/apt/trusted.gpg',
-                        os.path.join(new_etc_apt, 'trusted.gpg'))
+        if os.path.exists('/etc/apt/trusted.gpg'):
+            shutil.copyfile('/etc/apt/trusted.gpg',
+                            os.path.join(new_etc_apt, 'trusted.gpg'))
         # copy over additional keyrings
         if os.path.exists('/etc/apt/trusted.gpg.d'):
             shutil.copytree('/etc/apt/trusted.gpg.d',
@@ -66,7 +67,7 @@ def prepare_uris(packages):
         sources_list = open(os.path.join(new_etc_apt, 'sources.list'), "w")
         for source in sources:
             sources_list.write(
-                "deb [arch=armhf] {uri} wily {repositories}\n".format(
+                "deb [arch=armhf] {uri} xenial {repositories}\n".format(
                     uri=source.uri, repositories=source.repositories))
         sources_list.close()
         apt_pkg.config["Apt::Architecture"] = 'armhf'