Merge lp:~canonical-platform-qa/ubuntu-system-tests/add-new-packages into lp:ubuntu-system-tests

[Richard Huddie]

Create packaging to allow ubuntu-system-tests installation and execution from installed location.

Creates new deb packages:
- ubuntu-system-tests-host - This is the test runner scripts for the host
- ubuntu-system-tests-helpers - This is the helpers
- ubuntu-system-tests-suite - This is the test cases and test data
- ubuntu-system-tests-common - This is shared scripts
- ubuntu-system-tests - This includes all of the above

To test installing the packages for this change you need to install my own ppa on the device and host. This is required only before the MP lands in trunk, after which the packages will automatically be published in canonical-platform-qa/ppa.

To add my ppa do the following on both the host and device:
sudo add-apt-repository ppa:rhuddie/ust && sudo apt-get update

To install the host scripts to run the tests from the host:
sudo apt-get install ubuntu-system-tests-host

run "ubuntu-system-tests --help" to make sure its working ok.

Then you can run some tests on the device using "ubuntu-system-tests" with whatever normal command options you use. When running the tests from installed location you should see autopilot log "Loading tests from: /usr/lib/python3/dist-packages", rather than a local source dir.

You can also install everything on the host and list the tests by doing:
sudo apt-get install ubuntu-system-tests
autopilot3 list ubuntu_system_tests.tests

This MP makes some changes to the structure of the project. So there are now common and host folders added under ubuntu_system_tests. The previous command_line.py file is now moved to host folder, and replaced by run.py under the main folder.

Other changes include updating import paths to use the new folder structure and fixing the selftests.

Once this change lands then any jenkins scripts referencing ubuntu_system_tests.command_line will need to be updated to use ubuntu_system_tests.run. See additional MP for that:
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/use-ubuntu-system-tests-run/+merge/294620

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:405
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/add-new-packages/+merge/294378/+edit-commit-message

https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/143/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/198
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/198/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/198
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/198/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/174/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/143/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-system-tests/add-new-packages]

406. By Richard Huddie on 2016-05-11

Remove config dir.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:406
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/144/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/199
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/199/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/199
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/199/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/175/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/144/rebuild

review: Approve (continuous-integration)

[Santiago Baldassin (sbaldassin)]

Thanks for the patch Richard. I've just added a minor comment to refactor the clen_dir using os.walk

[lp:~canonical-platform-qa/ubuntu-system-tests/add-new-packages]

407. By Richard Huddie on 2016-05-13

Use os.walk in clean_dir, move remove_dir back into file_system helpers as no longer needed in common.

408. By Richard Huddie on 2016-05-13

Merge from trunk.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:407
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/150/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/207
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/207/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/207
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/207/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/182/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/150/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

> Thanks for the patch Richard. I've just added a minor comment to refactor the
> clen_dir using os.walk

Thanks Santiago, I've made that change.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:408
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/151/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/208
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/208/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/208
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/208/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/183/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/151/rebuild

review: Approve (continuous-integration)

[Allan LeSage (allanlesage)]

We'll attempt to land this presently.

review: Approve

=== modified file 'README.rst'
--- README.rst	2016-05-03 19:04:34 +0000
+++ README.rst	2016-05-13 10:11:11 +0000
@@ -3,6 +3,86 @@
 
 Project to automate the existing system test suite for the Ubuntu Touch images.
 
+Project packages
+----------------
+
+The ubuntu-system-tests project is split into 4 main packages:
+ubuntu-system-tests-host
+ubuntu-system-tests-helpers
+ubuntu-system-tests-suite
+ubuntu-system-tests-common
+
+ubuntu-system-tests-host package contains all the scripts neccessary to run the
+tests from a host machine on a connected device. This package should be
+installed on the host.
+
+ubuntu-system-tests-helpers package contains all the autopilot custom proxy
+object helpers used by the tests. This package is installed automatically
+on the device being tested.
+
+ubuntu-system-tests-suite package contains all the test cases and test data
+required for running the tests. This package is installed automatically on
+the device being tested.
+
+ubuntu-system-tests-common package contains common scripts shared by the other
+packages and is installed automatically.
+
+The ubuntu-system-tests package includes all of the 4 above packages.
+
+
+Installing on host
+------------------
+
+To install ubuntu-system-tests-host scripts on the host machine:
+
+::
+
+  $ sudo add-apt-repository ppa:canonical-platform-qa/ppa
+  $ sudo apt-get update
+  $ sudo apt-get install ubuntu-system-tests-host
+
+This will install the test runner scripts only.
+
+To see command options run:
+
+::
+
+  $ ubuntu-system-tests --help
+
+
+Listing all available tests
+---------------------------
+
+If you wish to list all available tests on the host machine install the
+ubuntu-system-tests package:
+
+::
+
+  $ sudo apt-get install ubuntu-system-tests
+
+This will install all test cases onto the host machine so they can be listed.
+
+To list the tests run:
+
+::
+
+  $ autopilot3 list ubuntu_system_tests.tests
+
+
+Branching the project
+---------------------
+
+In order to debug and develop new tests for ubuntu-system-tests the code must
+be branched locally. Tests will then be run against the branched version
+of the code rather than the installed version. To branch the code run:
+
+::
+
+  $ bzr branch lp:ubuntu-system-tests
+
+The remainder of the document assumes that code is branched locally.
+
+
 Run the project self tests
 --------------------------
 

=== modified file 'debian/control'
--- debian/control	2016-04-28 09:51:01 +0000
+++ debian/control	2016-05-13 10:11:11 +0000
@@ -1,7 +1,7 @@
 Source: ubuntu-system-tests
 Section: python
 Priority: optional
-Maintainer: Christopher Lee <[e-mail]>
+Maintainer: Canonical Platform QA Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-python,
                openssh-server,
@@ -20,9 +20,57 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
+         ubuntu-system-tests-helpers,
+         ubuntu-system-tests-host,
+         ubuntu-system-tests-suite,
+Description: Automated system test suite for UEQA.
+ Provides the whole ubuntu-system-tests package. Includes the host package to
+ run the tests on a target device from host machine, helpers package which
+ includes the autopilot custom proxy object helpers for each application, and
+ suite package which provides the test cases and test data.
+
+Package: ubuntu-system-tests-host
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         subunit,
+         ubuntu-system-tests-common,
+Description: Host test runner
+ This package contains scripts for running ubuntu-system-tests on a target
+ device from a host machine.
+
+Package: ubuntu-system-tests-helpers
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ubuntu-system-tests-common,
+Description: Ubuntu-system-tests autopilot helpers
+ This package contains all of the autopilot custom proxy object helpers for
+ each application used within ubuntu-system-tests.
+
+Package: ubuntu-system-tests-common
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
          python3-dbus,
+         python3-debian,
+         python3-gi,
+         python3-paramiko,
+         python3-pexpect,
+         python3-requests,
+         python3-retrying,
          python3-testtools,
-         subunit,
+         python3-warlock,
+Description: Ubuntu-system-tests common scripts
+ This package contains common scripts used by the ubuntu-system-tests host,
+ helpers and suite packages.
+
+Package: ubuntu-system-tests-suite
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-autopilot,
+         ubuntu-system-tests-common,
          unity8-autopilot,
-Description: Automation for UEQA system test-suite
- Automation for UEQA Ubuntu Touch image system test-suite.
+Description: Ubuntu-system-tests test suite and test data
+ This package contains test suites and test data for ubuntu-system-tests.

=== modified file 'debian/tests/control'
--- debian/tests/control	2016-04-20 15:18:49 +0000
+++ debian/tests/control	2016-05-13 10:11:11 +0000
@@ -32,6 +32,8 @@
          ubuntuone-credentials-autopilot,  # OPTIONAL
          ubuntu-system-settings,
          ubuntu-system-settings-autopilot (>=0.3+15.04.20150223-0ubuntu1),  # OPTIONAL
+         ubuntu-system-tests-helpers,  # OPTIONAL
+         ubuntu-system-tests-suite,  # OPTIONAL
          unity8,
          unity8-autopilot (>=8.02+15.04.20150224-0ubuntu1),  # OPTIONAL
          unity-scope-click,

=== added file 'debian/ubuntu-system-tests-common.install'
--- debian/ubuntu-system-tests-common.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-tests-common.install	2016-05-13 10:11:11 +0000
@@ -0,0 +1,2 @@
+usr/lib/python3*/*/ubuntu_system_tests/__init__.py
+usr/lib/python3*/*/ubuntu_system_tests/common/

=== added file 'debian/ubuntu-system-tests-helpers.install'
--- debian/ubuntu-system-tests-helpers.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-tests-helpers.install	2016-05-13 10:11:11 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3*/*/ubuntu_system_tests/helpers/

=== added file 'debian/ubuntu-system-tests-host.install'
--- debian/ubuntu-system-tests-host.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-tests-host.install	2016-05-13 10:11:11 +0000
@@ -0,0 +1,9 @@
+usr/bin/ubuntu-system-tests /usr/bin/
+usr/lib/python3*/*/ubuntu_system_tests*.egg-info
+usr/lib/python3*/*/ubuntu_system_tests/run.py
+usr/lib/python3*/*/ubuntu_system_tests/host/
+debian/control /usr/share/ubuntu-system-tests/debian/
+debian/changelog /usr/share/ubuntu-system-tests/debian/
+debian/tests/ /usr/share/ubuntu-system-tests/debian/
+test_lists/ /usr/share/ubuntu-system-tests/
+README.rst /usr/share/ubuntu-system-tests/

=== added file 'debian/ubuntu-system-tests-suite.install'
--- debian/ubuntu-system-tests-suite.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-tests-suite.install	2016-05-13 10:11:11 +0000
@@ -0,0 +1,3 @@
+usr/lib/python3*/*/ubuntu_system_tests/systemtests/
+usr/lib/python3*/*/ubuntu_system_tests/tests/
+ubuntu_system_tests/external_tests/ /usr/lib/python3/dist-packages/ubuntu_system_tests/

=== modified file 'setup.py'
--- setup.py	2016-05-05 17:37:44 +0000
+++ setup.py	2016-05-13 10:11:11 +0000
@@ -31,8 +31,8 @@
     name='ubuntu-system-tests',
     version=VERSION,
     description='Automated tests for Ubuntu Touch images.',
-    author='Christopher Lee',
-    author_email='[e-mail]',
+    author='Canonical Platform QA Team',
+    author_email='[e-mail]',
     url='https://launchpad.net/ubuntu-system-tests',
     license='GPLv3',
     packages=find_packages(),
@@ -45,7 +45,7 @@
     ],
     entry_points={
         'console_scripts': [
-            'ubuntu-system-tests = ubuntu_system_tests.command_line:main'
+            'ubuntu-system-tests = ubuntu_system_tests.run:main'
         ]
     },
     test_suite='ubuntu_system_tests.selftests',

=== added file 'ubuntu_system_tests/__init__.py'
--- ubuntu_system_tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/__init__.py	2016-05-13 10:11:11 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== added directory 'ubuntu_system_tests/common'
=== renamed file 'ubuntu_system_tests/__init__.py' => 'ubuntu_system_tests/common/__init__.py'
--- ubuntu_system_tests/__init__.py	2016-05-03 16:20:19 +0000
+++ ubuntu_system_tests/common/__init__.py	2016-05-13 10:11:11 +0000
@@ -20,6 +20,30 @@
 
 import inspect
 import os
+import random
+import string
+
+
+def clean_dir(dir_path):
+    """Delete all the content of the directory"""
+    for root, dirs, files in os.walk(dir_path, topdown=False):
+        for name in files:
+            os.remove(os.path.join(root, name))
+        for name in dirs:
+            os.rmdir(os.path.join(root, name))
+
+
+def delete_file(file_name):
+    """Delete the file passed as parameter. In case the file does not
+    exist, the deletion is skipped"""
+    if os.path.isfile(file_name):
+        os.unlink(file_name)
+
+
+def get_random_string(length=10):
+    """Get a string with random content"""
+    return ''.join(random.choice(string.ascii_uppercase) for i in
+                   range(length))
 
 
 def get_tests_ids_to_run(tests_module=None, testsuite_list_filepath=None):

=== renamed file 'ubuntu_system_tests/config/__init__.py' => 'ubuntu_system_tests/common/config.py'
--- ubuntu_system_tests/config/__init__.py	2016-05-06 10:18:32 +0000
+++ ubuntu_system_tests/common/config.py	2016-05-13 10:11:11 +0000
@@ -22,7 +22,7 @@
 import logging
 import os
 
-from ubuntu_system_tests.config import options
+from ubuntu_system_tests.common import options
 
 logger = logging.getLogger(__name__)
 config_stack = None

=== renamed file 'ubuntu_system_tests/config/options.py' => 'ubuntu_system_tests/common/options.py'
=== renamed file 'ubuntu_system_tests/ssh.py' => 'ubuntu_system_tests/common/ssh.py'
--- ubuntu_system_tests/ssh.py	2016-05-04 10:26:05 +0000
+++ ubuntu_system_tests/common/ssh.py	2016-05-13 10:11:11 +0000
@@ -27,7 +27,7 @@
 import stat
 import subprocess
 
-from ubuntu_system_tests.helpers.file_system import (
+from ubuntu_system_tests.common import (
     get_random_string,
     delete_file
 )

=== removed directory 'ubuntu_system_tests/config'
=== modified file 'ubuntu_system_tests/helpers/file_system.py'
--- ubuntu_system_tests/helpers/file_system.py	2016-05-10 14:11:19 +0000
+++ ubuntu_system_tests/helpers/file_system.py	2016-05-13 10:11:11 +0000
@@ -23,12 +23,12 @@
 import glob
 import hashlib
 import logging
-import random
 import os
 import shutil
-import string
 import subprocess
 
+from ubuntu_system_tests import common
+
 logger = logging.getLogger(__name__)
 
 FILE_PREFIX = 'file://'
@@ -125,8 +125,7 @@
 def delete_file(file_name):
     """Delete the file passed as parameter. In case the file does not
     exist, the deletion is skipped"""
-    if os.path.isfile(file_name):
-        os.unlink(file_name)
+    common.delete_file(file_name)
 
 
 def create_directory_if_not_exists(directory):
@@ -171,13 +170,7 @@
 
 def clean_dir(dir_path):
     """Delete all the content of the directory"""
-    if os.path.isdir(dir_path):
-        for obj in os.listdir(dir_path):
-            obj_path = os.path.join(dir_path, obj)
-            if os.path.isfile(obj_path):
-                os.remove(obj_path)
-            else:
-                remove_dir(obj_path)
+    common.clean_dir(dir_path)
 
 
 def move_folder_contents(src_root, dst_root):
@@ -218,8 +211,7 @@
 
 def get_random_string(length=10):
     """Get a string with random content"""
-    return ''.join(random.choice(string.ascii_uppercase) for i in
-                   range(length))
+    return common.get_random_string(length)
 
 
 def compare_files(file_1, file_2):

=== modified file 'ubuntu_system_tests/helpers/ssh.py'
--- ubuntu_system_tests/helpers/ssh.py	2016-05-04 10:09:48 +0000
+++ ubuntu_system_tests/helpers/ssh.py	2016-05-13 10:11:11 +0000
@@ -21,7 +21,7 @@
 import os
 import paramiko
 
-from ubuntu_system_tests import ssh as ssh_config
+from ubuntu_system_tests.common import ssh as ssh_config
 
 logger = logging.getLogger(__name__)
 

=== modified file 'ubuntu_system_tests/helpers/testbed.py'
--- ubuntu_system_tests/helpers/testbed.py	2016-05-03 14:17:46 +0000
+++ ubuntu_system_tests/helpers/testbed.py	2016-05-13 10:11:11 +0000
@@ -25,7 +25,7 @@
 
 from subprocess import check_call
 
-from ubuntu_system_tests import config
+from ubuntu_system_tests.common import config
 
 NM_PATH = '/etc/NetworkManager/system-connections/'
 ASKPASS_PATH = '/tmp/askpass.sh'

=== added directory 'ubuntu_system_tests/host'
=== added file 'ubuntu_system_tests/host/__init__.py'
--- ubuntu_system_tests/host/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/host/__init__.py	2016-05-13 10:11:11 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== renamed file 'ubuntu_system_tests/command_line.py' => 'ubuntu_system_tests/host/command_line.py'
--- ubuntu_system_tests/command_line.py	2016-05-09 18:32:36 +0000
+++ ubuntu_system_tests/host/command_line.py	2016-05-13 10:11:11 +0000
@@ -29,14 +29,15 @@
 import tempfile
 
 from argparse import ArgumentParser
-from ubuntu_system_tests import (
+from ubuntu_system_tests.host import (
+    results,
+    testdesc
+)
+from ubuntu_system_tests.common import (
+    clean_dir,
     config,
-    results,
     ssh,
-    testdesc
 )
-from ubuntu_system_tests.helpers.file_system import clean_dir
-
 
 logger = logging.getLogger(__name__)
 _ADT_RUN_SHORT_TIMEOUT = 600  # 10 minutes.
@@ -53,6 +54,11 @@
 EXT_LOG_DIR = '/userdata/apt-cacher-ng/logs'
 PERMISSION = '755'
 
+# Installation path for shared files
+INSTALLED_SHARE_DIR = '/usr/share/ubuntu-system-tests'
+# Installation path for installed python scripts
+INSTALLED_PYTHON_DIR = '/usr/lib/python'
+
 
 def main(argv=None):
     if argv is None:
@@ -382,6 +388,19 @@
     return content.rstrip()
 
 
+def _is_installed():
+    """Return True if the suite is running from installed location."""
+    return os.path.realpath(__file__).startswith(INSTALLED_PYTHON_DIR)
+
+
+def _get_debian_path():
+    """Return the path of the debian folder.
+    This will depend on whether tests are running from installed location
+    or local source directory.
+    """
+    return INSTALLED_SHARE_DIR if _is_installed() else os.getcwd()
+
+
 def _build_basic_adt_run_test_command(config_stack, extra_depends, verbose):
     """ Build and return the first part of the adt-run """
     output_dir = config_stack.get('output_dir')
@@ -399,7 +418,7 @@
         # Regression tests can take up to 8 hours, no reason to cut short.
         '--timeout-test={}'.format(_ADT_RUN_TEST_TIMEOUT),
         '-B',
-        '--unbuilt-tree={}'.format(os.getcwd()),
+        '--unbuilt-tree={}'.format(_get_debian_path()),
         '--output-dir',
         output_dir,
         # Even if the config file on the host has a different name, on the
@@ -657,7 +676,7 @@
     when the apt-get install does not install any package, the device is set
     as ro and exit, otherwise it is rebooted and will start as ro
     """
-    dir_name = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+    dir_name = _get_debian_path()
     if install_tests:
         dependencies = testdesc.get_all_dependencies(dir_name, 'TMPINSTALL')
     else:

=== renamed file 'ubuntu_system_tests/results.py' => 'ubuntu_system_tests/host/results.py'
=== renamed file 'ubuntu_system_tests/testdesc.py' => 'ubuntu_system_tests/host/testdesc.py'
=== added file 'ubuntu_system_tests/run.py'
--- ubuntu_system_tests/run.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/run.py	2016-05-13 10:11:11 +0000
@@ -0,0 +1,31 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+
+from ubuntu_system_tests.host import command_line
+
+
+def main(argv=None):
+    return command_line.main(argv)
+
+
+if __name__ == '__main__':
+    sys.exit(main())

=== modified file 'ubuntu_system_tests/selftests/__init__.py'
--- ubuntu_system_tests/selftests/__init__.py	2016-05-03 18:41:35 +0000
+++ ubuntu_system_tests/selftests/__init__.py	2016-05-13 10:11:11 +0000
@@ -24,7 +24,7 @@
 import unittest
 from unittest import mock
 
-from ubuntu_system_tests import config
+from ubuntu_system_tests.common import config
 
 DEFAULT_SECTION = '[{}]\n'.format(config.KEY_DEFAULT)
 ISOLATED_ENVIRON = {'HOME': None}

=== modified file 'ubuntu_system_tests/selftests/test_command_line.py'
--- ubuntu_system_tests/selftests/test_command_line.py	2016-05-03 15:58:08 +0000
+++ ubuntu_system_tests/selftests/test_command_line.py	2016-05-13 10:11:11 +0000
@@ -26,11 +26,9 @@
 
 import testscenarios
 
-from ubuntu_system_tests import (
-    config,
-    command_line,
-    selftests
-)
+from ubuntu_system_tests import selftests
+from ubuntu_system_tests.host import command_line
+from ubuntu_system_tests.common import config
 
 
 def check_any_item_in_list_contains_value(list, value):
@@ -198,7 +196,7 @@
                             'dep2']
         # Mock _read_dependency_files
         with mock.patch(
-            'ubuntu_system_tests.command_line._read_dependency_files'
+            'ubuntu_system_tests.host.command_line._read_dependency_files'
         ) as mock_read_depends:
             mock_read_depends.return_value = {
                 'app2.tests': 'dep1',
@@ -297,7 +295,7 @@
         super().setUp()
         self.config_stack = config.UbuntuSystemTestsConfig()
 
-    @mock.patch('ubuntu_system_tests.command_line.generate_user_report')
+    @mock.patch('ubuntu_system_tests.host.command_line.generate_user_report')
     def test_run_system_tests_commands(self, mock_generate_user_report):
         def get_command_from_call(call):
             """Return the name of the command, without the arguments."""
@@ -535,7 +533,7 @@
         }),
     ]
 
-    @mock.patch('ubuntu_system_tests.command_line.run_system_tests')
+    @mock.patch('ubuntu_system_tests.host.command_line.run_system_tests')
     def test_main_must_pass_command_line_arguments_to_run_system_tests(
             self, mock_run_system_tests):
         command_line.main(self.command_line_arguments)

=== modified file 'ubuntu_system_tests/selftests/test_config.py'
--- ubuntu_system_tests/selftests/test_config.py	2016-05-03 16:20:19 +0000
+++ ubuntu_system_tests/selftests/test_config.py	2016-05-13 10:11:11 +0000
@@ -25,11 +25,9 @@
 import fixtures
 from autopilot.introspection import ProxyBase
 
-from ubuntu_system_tests import (
-    config,
-    selftests,
-)
-from ubuntu_system_tests.config.options import Option
+from ubuntu_system_tests import selftests
+from ubuntu_system_tests.common import config
+from ubuntu_system_tests.common.options import Option
 from ubuntu_system_tests.helpers.autopilot import override_proxy_timeout
 
 
@@ -186,8 +184,8 @@
         return config_stack
 
     def test_alternative_store_location(self):
-        get_user_config_dir = 'ubuntu_system_tests.config.get_user_config_dir'
-        with mock.patch(get_user_config_dir) as mock_config_dir:
+        config_dir = 'ubuntu_system_tests.common.config.get_user_config_dir'
+        with mock.patch(config_dir) as mock_config_dir:
             mock_config_dir.return_value = self.uniq_dir
             config_stack = config.UbuntuSystemTestsConfig('alternative.conf')
 

=== modified file 'ubuntu_system_tests/selftests/test_results.py'
--- ubuntu_system_tests/selftests/test_results.py	2016-04-29 15:51:06 +0000
+++ ubuntu_system_tests/selftests/test_results.py	2016-05-13 10:11:11 +0000
@@ -22,11 +22,9 @@
 import os
 from unittest import mock
 
-from ubuntu_system_tests import (
-    config,
-    results,
-    selftests
-)
+from ubuntu_system_tests import selftests
+from ubuntu_system_tests.host import results
+from ubuntu_system_tests.common import config
 
 
 class ResultsTestCase(selftests.ConfigBaseTestCase):

=== modified file 'ubuntu_system_tests/selftests/test_testbed_commands.py'
--- ubuntu_system_tests/selftests/test_testbed_commands.py	2016-04-28 18:50:20 +0000
+++ ubuntu_system_tests/selftests/test_testbed_commands.py	2016-05-13 10:11:11 +0000
@@ -19,10 +19,10 @@
 #
 
 from ubuntu_system_tests import (
-    config,
     systemtests,
     selftests
 )
+from ubuntu_system_tests.common import config
 
 
 class AutopilotCommandsTestCase(selftests.ConfigBaseTestCase):

=== modified file 'ubuntu_system_tests/selftests/test_tests_to_run.py'
--- ubuntu_system_tests/selftests/test_tests_to_run.py	2016-05-03 15:58:08 +0000
+++ ubuntu_system_tests/selftests/test_tests_to_run.py	2016-05-13 10:11:11 +0000
@@ -28,11 +28,11 @@
 import fixtures
 import testscenarios
 
-import ubuntu_system_tests
 from ubuntu_system_tests import (
     external_tests,
     selftests,
 )
+from ubuntu_system_tests.common import get_tests_ids_to_run
 
 
 class ExternalTestsListFile(fixtures.Fixture):
@@ -175,7 +175,7 @@
     def test_get_tests_with_no_internal_tests_module(self):
         external_tests = ['external_test_1']
         with ExternalTestsListFile(external_tests) as test_lists_file:
-            tests_to_run = ubuntu_system_tests.get_tests_ids_to_run(
+            tests_to_run = get_tests_ids_to_run(
                 tests_module='not a module',
                 testsuite_list_filepath=test_lists_file.path)
 
@@ -187,7 +187,7 @@
         tests_module = types.ModuleType('internal_tests_module')
 
         with ExternalTestsListFile(external_tests) as test_lists_file:
-            tests_to_run = ubuntu_system_tests.get_tests_ids_to_run(
+            tests_to_run = get_tests_ids_to_run(
                 tests_module, test_lists_file.path)
 
         expected_tests = external_tests + ['internal_tests_module']

=== added directory 'ubuntu_system_tests/systemtests'
=== renamed file 'ubuntu_system_tests/systemtests.py' => 'ubuntu_system_tests/systemtests/__init__.py'
--- ubuntu_system_tests/systemtests.py	2016-05-03 14:52:27 +0000
+++ ubuntu_system_tests/systemtests/__init__.py	2016-05-13 10:11:11 +0000
@@ -21,10 +21,10 @@
 import os
 import subprocess
 
-import ubuntu_system_tests
-from ubuntu_system_tests import (
+from ubuntu_system_tests import external_tests
+from ubuntu_system_tests.common import (
     config,
-    external_tests,
+    get_tests_ids_to_run,
     ssh
 )
 
@@ -36,7 +36,7 @@
     config_stack = config.get_device_config_stack()
     ssh.prepare_device_keys()
 
-    test_ids = ubuntu_system_tests.get_tests_ids_to_run()
+    test_ids = get_tests_ids_to_run()
     result = run_autopilot_tests(config_stack, artifacts_directory, *test_ids)
     ensure_keyfile_deleted()
 

=== modified file 'ubuntu_system_tests/tests/base_telephony.py'
--- ubuntu_system_tests/tests/base_telephony.py	2016-03-10 17:35:10 +0000
+++ ubuntu_system_tests/tests/base_telephony.py	2016-05-13 10:11:11 +0000
@@ -20,7 +20,7 @@
 
 from threading import Event
 
-from ubuntu_system_tests import config
+from ubuntu_system_tests.common import config
 from ubuntu_system_tests.helpers import ofono
 from ubuntu_system_tests.helpers.addressbook import (
     fixture_setup as address_book_fixture)

=== modified file 'ubuntu_system_tests/tests/perf/__init__.py'
--- ubuntu_system_tests/tests/perf/__init__.py	2016-03-15 03:11:03 +0000
+++ ubuntu_system_tests/tests/perf/__init__.py	2016-05-13 10:11:11 +0000
@@ -21,7 +21,7 @@
 import logging
 
 
-from ubuntu_system_tests import config
+from ubuntu_system_tests.common import config
 from ubuntu_system_tests.helpers import file_system as fs
 from ubuntu_system_tests.helpers.platform import (
     get_channel_name, get_device_name, get_build_number)

=== modified file 'ubuntu_system_tests/tests/test_settings_wizard.py'
--- ubuntu_system_tests/tests/test_settings_wizard.py	2016-02-29 21:51:29 +0000
+++ ubuntu_system_tests/tests/test_settings_wizard.py	2016-05-13 10:11:11 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>
 
-from ubuntu_system_tests.config import get_device_config_stack
+from ubuntu_system_tests.common.config import get_device_config_stack
 from ubuntu_system_tests.helpers import ofono
 from ubuntu_system_tests.helpers.platform import (
     is_agps_supported, is_wifi_supported