Merge lp:~kissiel/checkbox/autopilot-infrastructure into lp:checkbox

[Maciej Kisielewski]

This MR replaces https://code.launchpad.net/~kissiel/checkbox/autopilot-testing/+merge/253774 as the previous one failed to be auto-merged by tarmac.

[Maciej Kisielewski (kissiel)]

Self-approving. This was already reviewed here: https://code.launchpad.net/~kissiel/checkbox/autopilot-testing/+merge/253774

If this doesn't land, it means that tarmac is seriously borked.

review: Approve

=== modified file 'checkbox-touch/Makefile'
--- checkbox-touch/Makefile	2014-08-11 14:20:37 +0000
+++ checkbox-touch/Makefile	2015-03-23 21:22:52 +0000
@@ -11,6 +11,7 @@
 all:
 
 autopilot:
+	./get-libs
 	chmod +x tests/autopilot/run
 	tests/autopilot/run
 
@@ -18,5 +19,5 @@
 	qmltestrunner -input tests/unit
 
 run:
-	/usr/bin/qmlscene $@ main.qml
+	/usr/bin/qmlscene $@ checkbox-touch.qml
 

=== modified file 'checkbox-touch/README.rst'
--- checkbox-touch/README.rst	2014-12-03 15:05:34 +0000
+++ checkbox-touch/README.rst	2015-03-23 21:22:52 +0000
@@ -56,7 +56,7 @@
 Running Checkbox-Touch on a desktop
 -----------------------------------
 
-To run on a desktop run `qmlscene main.qml`
+To run on a desktop run `qmlscene checkbox-touch.qml`
 Note: Make sure you've ran `./get-libs` first.
 
 

=== modified file 'checkbox-touch/build-me'
--- checkbox-touch/build-me	2015-03-13 14:21:40 +0000
+++ checkbox-touch/build-me	2015-03-23 21:22:52 +0000
@@ -80,7 +80,8 @@
         "_comment": "file generated automatically with {0}"
                     .format(parser.prog),
         "revision": get_revision_string(),
-        "testplan": args.testplan
+        "testplan": args.testplan,
+        "providersDir": "providers"
     }
     settings_file = open('settings.json', 'w')
     settings_file.write(json.dumps(settings, sort_keys=True, indent=4))
@@ -115,7 +116,7 @@
     [Desktop Entry]
     Name=Checkbox
     Comment=System testing utility for Ubuntu
-    Exec=qmlscene {import_options} $@ main.qml
+    Exec=qmlscene {import_options} $@ checkbox-touch.qml
     Icon=checkbox-touch.svg
     Terminal=false
     Type=Application

=== removed symlink 'checkbox-touch/checkbox-touch.qml'
=== target was u'preview.qml'
=== renamed file 'checkbox-touch/main.qml' => 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/main.qml	2015-02-09 14:19:48 +0000
+++ checkbox-touch/checkbox-touch.qml	2015-03-23 21:22:52 +0000
@@ -57,24 +57,41 @@
     property var appSettings: {
         "applicationName" : applicationName,
         "revision": "unknown revision",
-        "testplan": ""
+        "testplan": "",
+        "providersDir": "providers"
+    }
+
+    Arguments {
+        id: args
+        Argument {
+            name: "autopilot"
+            help: i18n.tr("Run Checkbox-Touch in autopilot-testing mode")
+            required: false
+        }
     }
 
     Component.onCompleted: {
-        var xhr = new XMLHttpRequest;
-        xhr.open("GET", "settings.json");
-        xhr.onreadystatechange = function() {
-            if (xhr.readyState == XMLHttpRequest.DONE) {
-                try {
-                    appSettings = JSON.parse(xhr.responseText);
-                } catch (x) {
-                    // if we cannot parse settings.json, we should leave
-                    // deafult values of appSettings
-                    console.log("Could not parse settings.json. Using default values")
+        if (args.values["autopilot"]) {
+            // autopilot-testing mode
+            appSettings["testplan"] = "2015.com.canonical.certification::checkbox-touch-autopilot"
+            appSettings["providersDir"] = "tests/autopilot/autopilot-provider"
+        } else {
+            // normal execution - load settings.json file
+            var xhr = new XMLHttpRequest;
+            xhr.open("GET", "settings.json");
+            xhr.onreadystatechange = function() {
+                if (xhr.readyState == XMLHttpRequest.DONE) {
+                    try {
+                        appSettings = JSON.parse(xhr.responseText);
+                    } catch (x) {
+                        // if we cannot parse settings.json, we should leave
+                        // deafult values of appSettings
+                        console.log("Could not parse settings.json. Using default values")
+                    }
                 }
             }
+            xhr.send();
         }
-        xhr.send();
     }
 
 
@@ -115,7 +132,7 @@
                 "checkbox_touch" : applicationVersion,
                 "plainbox" : plainboxVersion
             };
-            resumeOrStartSession();
+            resumeOrStartSession(appSettings["providersDir"]);
         }
         onSessionReady: {
             welcomePage.enableButton()
@@ -223,7 +240,7 @@
         onRestartSession: {
             pageStack.clear();
             pageStack.push(welcomePage);
-            app.startSession();
+            app.startSession(appSettings["providersDir"]);
         }
     }
 
@@ -310,10 +327,10 @@
             } else {
                 if (result.errors_encountered) {
                     ErrorLogic.showError(mainView, i18n.tr("Could not resume session."),
-                                         app.startSession(),
+                                         app.startSession(appSettings["providersDir"]),
                                          i18n.tr("Start new session"));
                 } else {
-                    app.startSession();
+                    app.startSession(appSettings["providersDir"]);
                 }
             }
         });
@@ -363,7 +380,7 @@
             resultsPage.endTesting.connect(function() {
                 pageStack.clear();
                 app.clearSession(function() {
-                    app.startSession();
+                    app.startSession(appSettings["providersDir"]);
                     pageStack.push(welcomePage);
                 });
             });

=== modified file 'checkbox-touch/checkbox-touch.qmlproject'
--- checkbox-touch/checkbox-touch.qmlproject	2014-08-12 18:58:43 +0000
+++ checkbox-touch/checkbox-touch.qmlproject	2015-03-23 21:22:52 +0000
@@ -1,7 +1,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "main.qml"
+    mainFile: "checkbox-touch.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {

=== modified file 'checkbox-touch/components/CheckboxTouchApplication.qml'
--- checkbox-touch/components/CheckboxTouchApplication.qml	2015-03-13 14:21:45 +0000
+++ checkbox-touch/components/CheckboxTouchApplication.qml	2015-03-23 21:22:52 +0000
@@ -44,16 +44,16 @@
     // Starts session in plainbox and runs all necessary setup actions.
     // Calling this function will signal sessionReady() once it's finished
     // doing setup.
-    function startSession() {
-        request("start_session", [], function(result) {
+    function startSession(providersDir) {
+        request("start_session", [providersDir], function(result) {
             sessionDir = result['session_dir'];
             sessionReady();
         }, function(error) {
             console.error("Unable to start session: " + error);
         });
     }
-    function resumeSession(rerunLastTest, continuation) {
-        request("resume_session", [rerunLastTest], function(result) {
+    function resumeSession(rerunLastTest, providersDir, continuation) {
+        request("resume_session", [rerunLastTest, providersDir], function(result) {
             if (!result["session_id"]) {
                 pageStack.pop();
                 ErrorLogic.showError(mainView,

=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2015-03-13 14:21:45 +0000
+++ checkbox-touch/py/checkbox_touch.py	2015-03-23 21:22:52 +0000
@@ -351,7 +351,7 @@
         }
 
     @view
-    def start_session(self):
+    def start_session(self, providers_dir):
         if self.manager is not None:
             _logger.warning("start_session() should not be called twice!")
         else:
@@ -360,7 +360,7 @@
             self.manager.add_local_device_context()
             self.context = self.manager.default_device_context
             # Add some all providers into the context
-            for provider in self._get_default_providers():
+            for provider in self._get_default_providers(providers_dir):
                 self.context.add_provider(provider)
             # Fill in the meta-data
             self.context.state.metadata.app_id = 'checkbox-touch'
@@ -386,9 +386,10 @@
         }
 
     @view
-    def resume_session(self, rerun_last_test):
+    def resume_session(self, rerun_last_test, providers_dir):
         all_units = list(itertools.chain(
-            *[p.unit_list for p in self._get_default_providers()]))
+            *[p.unit_list for p in self._get_default_providers(
+                providers_dir)]))
         try:
             self.manager = SessionManager.load_session(
                 all_units, self.resume_candidate_storage)
@@ -772,12 +773,24 @@
         self.session_storage_repo = SessionStorageRepository(
             self._get_app_cache_directory())
 
-    def _get_default_providers(self):
+    def _get_default_providers(self, providers_dir):
+        """
+        Get providers
+
+        :param providers_dir:
+            Path within application tree from which to load providers
+        :returns:
+            list of loaded providers
+        """
         all_providers.load()
         provider_list = all_providers.get_all_plugin_objects()
         # when running on ubuntu-touch device, APP_DIR env var is present
         # and points to touch application top directory
-        path = os.path.join(os.path.expandvars('$APP_DIR'), 'providers')
+        app_root_dir = os.path.normpath(os.getenv(
+            'APP_DIR', os.path.join(os.path.dirname(__file__), '..')))
+        path = os.path.join(app_root_dir,
+                            os.path.normpath(providers_dir))
+        _logger.info("Loading all providers from %s", path)
         if os.path.exists(path):
             embedded_providers = EmbeddedProvider1PlugInCollection(path)
             provider_list += embedded_providers.get_all_plugin_objects()

=== added directory 'checkbox-touch/tests/autopilot/autopilot-provider'
=== added directory 'checkbox-touch/tests/autopilot/autopilot-provider/jobs'
=== added file 'checkbox-touch/tests/autopilot/autopilot-provider/jobs/autopilot.pxu'
--- checkbox-touch/tests/autopilot/autopilot-provider/jobs/autopilot.pxu	1970-01-01 00:00:00 +0000
+++ checkbox-touch/tests/autopilot/autopilot-provider/jobs/autopilot.pxu	2015-03-23 21:22:52 +0000
@@ -0,0 +1,7 @@
+unit: test plan
+_description:
+ Test plan that should be default one run by autopilot.
+id: checkbox-touch-autopilot
+_name: Checkbox-Touch autpoilot self-test
+estimated_duration: 60
+include: autopilot/.*

=== added file 'checkbox-touch/tests/autopilot/autopilot-provider/manage.py'
--- checkbox-touch/tests/autopilot/autopilot-provider/manage.py	1970-01-01 00:00:00 +0000
+++ checkbox-touch/tests/autopilot/autopilot-provider/manage.py	2015-03-23 21:22:52 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+# You can inject other stuff here but please don't go overboard.
+#
+# In particular, if you need comprehensive compilation support to get
+# your bin/ populated then please try to discuss that with us in the
+# upstream project IRC channel #checkbox on irc.freenode.net.
+
+# NOTE: one thing that you could do here, that makes a lot of sense,
+# is to compute version somehow. This may vary depending on the
+# context of your provider. Future version of PlainBox will offer git,
+# bzr and mercurial integration using the versiontools library
+# (optional)
+
+setup(
+    name='2015.com.canonical.certification:autopilot-touch',
+    version="1.0",
+    description=N_("The 2015.com.canonical.certification:autopilot-touch provider"),
+    gettext_domain="2015_com_canonical_certification_autopilot-touch",
+)
\ No newline at end of file

=== modified file 'checkbox-touch/tests/autopilot/checkbox_touch/__init__.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/__init__.py	2014-08-11 12:36:57 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/__init__.py	2015-03-23 21:22:52 +0000
@@ -47,6 +47,7 @@
                 base.get_qmlscene_launch_command(),
                 '-I' + _get_module_include_path(),
                 app_qml_source_location,
+                '--autopilot',
                 app_type='qt',
                 emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
         else:

=== added file 'checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py	1970-01-01 00:00:00 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py	2015-03-23 21:22:52 +0000
@@ -0,0 +1,12 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+import checkbox_touch
+
+class TestCheckboxTouch(checkbox_touch.ClickAppTestCase):
+    """Test checking if app launches"""
+    def test_launches(self):
+        main_view = self.app.select_single(objectName='mainView')
+        self.assertThat(main_view.visible, Eventually(Equals(True)))

=== removed file 'checkbox-touch/tests/autopilot/checkbox_touch/test_latch_button.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/test_latch_button.py	2014-09-11 08:09:35 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/test_latch_button.py	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-from testtools.matchers import Equals
-
-import checkbox_touch
-
-
-class LatchButtonTestCase(checkbox_touch.ClickAppTestCase):
-    """Tests for the LatchButton component"""
-    def test_latching(self):
-        latch_button = self.app.select_single(objectName="latchButton")
-        latch_button.swipe_into_view()
-        signal = latch_button.watch_signal("latchedClicked()")
-        self.pointing_device.click_object(latch_button)
-        self.pointing_device.click_object(latch_button)  # click again!
-        self.assertThat(signal.num_emissions, Equals(1))

=== removed file 'checkbox-touch/tests/autopilot/checkbox_touch/test_manual_intro_page.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/test_manual_intro_page.py	2014-09-11 08:09:35 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/test_manual_intro_page.py	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-from testtools.matchers import Equals
-
-import checkbox_touch
-
-
-class ManualIntroPageTestCase(checkbox_touch.ClickAppTestCase):
-    """Tests for the Intro page to Manual test"""
-
-    def setUp(self):
-        super(ManualIntroPageTestCase, self).setUp()
-        # open ManualIntroPage by clicking on 'Manual test page' butotn
-        button = self.main_view.select_single(
-            objectName='manualIntroPageButton')
-        self.pointing_device.click_object(button)
-        self.page = self.app.select_single(objectName='manualIntroPage')
-
-    def test_default_content(self):
-        self.assertThat(self.page.title, Equals('Test Description'))
-
-    def test_continue_button(self):
-        continue_button = self.page.select_single(objectName='continueButton')
-        self.assertThat(continue_button.text, Equals('Continue'))
-        signal = self.page.watch_signal('continueClicked()')
-        self.pointing_device.click_object(continue_button)
-        self.assertThat(signal.was_emitted, Equals(True))
-
-    def test_goes_to_verification(self):
-        continue_button = self.page.select_single(objectName='continueButton')
-        self.pointing_device.click_object(continue_button)
-        next_page = self.app.select_single(objectName='testVerificationPage')
-        self.assertThat(next_page.title, Equals('Verification'))
-        page_stack = self.main_view.select_single(objectName='pageStack')
-        self.assertThat(page_stack.depth, Equals(3))

=== removed file 'checkbox-touch/tests/autopilot/checkbox_touch/test_resume_session_screen.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/test_resume_session_screen.py	2014-09-11 08:09:35 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/test_resume_session_screen.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-from testtools.matchers import Equals
-
-import checkbox_touch
-
-
-class ResumeSessionScreenTestCase(checkbox_touch.ClickAppTestCase):
-    """Tests for resume session screen"""
-
-    def setUp(self):
-        super(ResumeSessionScreenTestCase, self).setUp()
-        # click "resume session page"
-        button = self.main_view.select_single(
-            objectName='resumeSessionPageButton')
-        self.pointing_device.click_object(button)
-        self.page = self.app.select_single(objectName='resumeSessionPage')
-
-    def test_default_content(self):
-        self.assertThat(self.page.title, Equals('Resume session'))
-        button_texts = [('rerunButtonLabel', 'Rerun last'),
-                        ('continueButtonLabel', 'Continue'),
-                        ('restartButtonLabel', 'Restart')]
-        for obj_name, text in button_texts:
-            obj = self.main_view.select_single(objectName=obj_name)
-            self.assertThat(obj.text, Equals(text))
-
-    def test_signal_rerun_last(self):
-        signal_watcher = self.page.watch_signal('rerunLast()')
-        button = self.main_view.select_single(objectName='rerunButton')
-        self.pointing_device.click_object(button)
-        self.assertThat(signal_watcher.was_emitted, Equals(True))
-        page_stack = self.main_view.select_single(objectName='pageStack')
-        self.assertThat(page_stack.depth, Equals(1))
-
-    def test_signal_continue_session(self):
-        signal_watcher = self.page.watch_signal('continueSession()')
-        button = self.main_view.select_single(objectName='continueButton')
-        self.pointing_device.click_object(button)
-        self.assertThat(signal_watcher.was_emitted, Equals(True))
-        page_stack = self.main_view.select_single(objectName='pageStack')
-        self.assertThat(page_stack.depth, Equals(1))
-
-    def test_signal_restart_session(self):
-        signal_watcher = self.page.watch_signal('restartSession()')
-        button = self.main_view.select_single(objectName='restartButton')
-        self.pointing_device.click_object(button)
-        self.assertThat(signal_watcher.was_emitted, Equals(True))
-        page_stack = self.main_view.select_single(objectName='pageStack')
-        self.assertThat(page_stack.depth, Equals(1))

=== modified file 'checkbox-touch/tests/autopilot/run'
--- checkbox-touch/tests/autopilot/run	2014-08-11 12:36:57 +0000
+++ checkbox-touch/tests/autopilot/run	2015-03-23 21:22:52 +0000
@@ -2,11 +2,13 @@
 
 if [[ -z `which autopilot` ]]; then
   echo "Autopilot is not installed. Skip"
-  exit
+  exit 1
 fi
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
 autopilot run checkbox_touch
+ret=$?
 popd
+exit $ret