Merge lp:~autopilot/autopilot/more_ap_ap_test_fixes into lp:autopilot

[Łukasz Zemczak]

Branch for fixing the latest failing autopilot tests

Branch for fixing the latest failing autopilot tests:

(on private jenkins):
/job/ps-generic-autopilot-release-testing/391/label=autopilot-nvidia/testReport/

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:218
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/~autopilot/autopilot/more_ap_ap_test_fixes/+merge/164037/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-ci/88/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/88/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~autopilot/autopilot/more_ap_ap_test_fixes/+merge/164037/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-autolanding/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-autolanding/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-autolanding/13/console

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

ok, Thomi, I think this is for you :p

[lp:~autopilot/autopilot/more_ap_ap_test_fixes]

219. By Thomi Richards on 2013-05-16

Fix test.

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Omer Akram (om26er)]

This branch breaks autopilot on touch devices.

=== modified file 'autopilot/__init__.py'
--- autopilot/__init__.py	2013-05-06 23:19:57 +0000
+++ autopilot/__init__.py	2013-05-16 15:55:46 +0000
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from argparse import ArgumentParser, REMAINDER
+from argparse import ArgumentParser, REMAINDER, Action
 
 version = '1.3'
 
@@ -97,7 +97,8 @@
                             action='count', help="Show autopilot log messages. \
                             Set twice to also log data useful for debugging \
                             autopilot itself.")
-    parser_launch.add_argument('application', nargs=REMAINDER, type=str,
+    parser_launch.add_argument('application', action=_OneOrMoreArgumentStoreAction,
+                            type=str, nargs=REMAINDER,
                             help="The application to launch. Can be a full path, \
                             or just an application name (in which case Autopilot \
                                 will search for it in $PATH).")
@@ -106,6 +107,14 @@
     return args
 
 
+class _OneOrMoreArgumentStoreAction(Action):
+
+    def __call__(self,  parser, namespace, values, option_string=None):
+        if len(values) == 0:
+            parser.error("Must specify at least one argument to the 'launch' command")
+        setattr(namespace, self.dest, values)
+
+
 def have_vis():
     """Return true if the vis package is installed."""
     try:

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2013-05-13 04:43:32 +0000
+++ autopilot/input/_uinput.py	2013-05-16 15:55:46 +0000
@@ -176,8 +176,20 @@
     if res_x is None or res_y is None:
         from autopilot.display import Display
         display = Display.create()
-        res_x = display.get_screen_width()
-        res_y = display.get_screen_height()
+        # TODO: This calculation needs to become part of the display module:
+        l = r = t = b = 0
+        for screen in range(display.get_num_screens()):
+            geometry = display.get_screen_geometry(screen)
+            if geometry[0] < l:
+                l = geometry[0]
+            if geometry[1] < t:
+                t = geometry[1]
+            if geometry[0] + geometry[2] > r:
+                r = geometry[0] + geometry[2]
+            if geometry[1] + geometry[3] > b:
+                b = geometry[1] + geometry[3];
+        res_x = r - l
+        res_y = b - t
 
     # android uses BTN_TOOL_FINGER, whereas desktop uses BTN_TOUCH. I have no
     # idea why...

=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py	2013-05-09 00:04:33 +0000
+++ autopilot/testcase.py	2013-05-16 15:55:46 +0000
@@ -139,12 +139,13 @@
         self._kb = None
         self._display = None
 
+        self._app_snapshot = self.process_manager.get_running_applications()
+        self.addCleanup(self._compare_system_with_app_snapshot)
+
     @property
     def process_manager(self):
         if self._process_manager is None:
             self._process_manager = ProcessManager.create()
-            self._app_snapshot = self.process_manager.get_running_applications()
-            self.addCleanup(self._compare_system_with_app_snapshot)
         return self._process_manager
 
     @property

=== modified file 'autopilot/tests/functional/test_application_mixin.py'
--- autopilot/tests/functional/test_application_mixin.py	2013-05-05 21:22:50 +0000
+++ autopilot/tests/functional/test_application_mixin.py	2013-05-16 15:55:46 +0000
@@ -26,6 +26,18 @@
 
 class ApplicationSupportTests(AutopilotTestCase):
 
+    def test_launch_with_bad_types_raises_typeerror(self):
+        """Calling launch_test_application with something other than a string must
+        raise a TypeError"""
+
+        self.assertThat(lambda: self.launch_test_application(1), raises(TypeError))
+        self.assertThat(lambda: self.launch_test_application(True), raises(TypeError))
+        self.assertThat(lambda: self.launch_test_application(1.0), raises(TypeError))
+        self.assertThat(lambda: self.launch_test_application(object()), raises(TypeError))
+        self.assertThat(lambda: self.launch_test_application(None), raises(TypeError))
+        self.assertThat(lambda: self.launch_test_application([]), raises(TypeError))
+        self.assertThat(lambda: self.launch_test_application((None,)), raises(TypeError))
+
     def test_launch_raises_ValueError_on_unknown_kwargs(self):
         """launch_test_application must raise ValueError when given unknown
         keyword arguments.

=== modified file 'autopilot/tests/functional/test_autopilot_functional.py'
--- autopilot/tests/functional/test_autopilot_functional.py	2013-05-15 05:24:14 +0000
+++ autopilot/tests/functional/test_autopilot_functional.py	2013-05-16 15:55:46 +0000
@@ -88,6 +88,7 @@
             os.path.join(
                 os.path.dirname(__file__),
                 '..',
+                '..',
                 '..'
                 )
             )
@@ -376,14 +377,18 @@
 
     def test_record_flag_works(self):
         """Must be able to record videos when the -r flag is present."""
+
+        # The sleep is to avoid the case where recordmydesktop does not create a
+        # file because it gets stopped before it's even started capturing anything.
         self.create_test_file("test_simple.py", dedent("""\
 
             from autopilot.testcase import AutopilotTestCase
-
+            from time import sleep
 
             class SimpleTest(AutopilotTestCase):
 
                 def test_simple(self):
+                    sleep(1)
                     self.fail()
             """
             ))
@@ -397,14 +402,19 @@
 
     def test_record_dir_option_works(self):
         """Must be able to specify record directory flag."""
+
+        # The sleep is to avoid the case where recordmydesktop does not create a
+        # file because it gets stopped before it's even started capturing anything.
         self.create_test_file("test_simple.py", dedent("""\
 
             from autopilot.testcase import AutopilotTestCase
+            from time import sleep
 
 
             class SimpleTest(AutopilotTestCase):
 
                 def test_simple(self):
+                    sleep(1)
                     self.fail()
             """
             ))

=== renamed file 'autopilot/tests/unit/test_custom_assertions.py' => 'autopilot/tests/functional/test_custom_assertions.py'
--- autopilot/tests/unit/test_custom_assertions.py	2013-05-05 02:39:14 +0000
+++ autopilot/tests/functional/test_custom_assertions.py	2013-05-16 15:55:46 +0000
@@ -20,9 +20,9 @@
 
 from __future__ import absolute_import
 
+from autopilot.testcase import AutopilotTestCase
 from testtools.matchers import Equals, raises, Not
 
-from autopilot.testcase import AutopilotTestCase
 import logging
 logger = logging.getLogger(__name__)
 

=== modified file 'autopilot/tests/functional/test_process_emulator.py'
--- autopilot/tests/functional/test_process_emulator.py	2013-05-15 10:07:35 +0000
+++ autopilot/tests/functional/test_process_emulator.py	2013-05-16 15:55:46 +0000
@@ -23,9 +23,9 @@
 from autopilot.process import ProcessManager
 from autopilot.globals import on_test_started
 
-from subprocess import Popen, call, CalledProcessError, check_output
+from subprocess import Popen, call
 from testtools import TestCase
-from testtools.matchers import Equals, NotEquals, LessThan, Raises
+from testtools.matchers import Equals, NotEquals, LessThan
 from threading import Thread
 from time import sleep, time
 
@@ -102,7 +102,7 @@
     def test_can_close_all_app(self):
         """Ensure that closing an app actually closes all app instances."""
         try:
-            process_manager = ProcessManager.create(preferred_backend="BAM")
+            process_manager = ProcessManager.create(preferred_backend="BAMF")
         except BackendException as e:
             self.skip("Test is only for BAMF backend ({}).".format(e.message))
 

=== removed file 'autopilot/tests/unit/test_application_mixin.py'
--- autopilot/tests/unit/test_application_mixin.py	2013-05-05 21:22:50 +0000
+++ autopilot/tests/unit/test_application_mixin.py	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Autopilot Functional Test Tool
-# Copyright (C) 2012-2013 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/>.
-#
-
-
-from __future__ import absolute_import
-
-from autopilot.testcase import AutopilotTestCase
-from testtools.matchers import raises
-
-
-class ApplicationSupportTests(AutopilotTestCase):
-
-    def test_launch_with_bad_types_raises_typeerror(self):
-        """Calling launch_test_application with something other than a string must
-        raise a TypeError"""
-
-        self.assertThat(lambda: self.launch_test_application(1), raises(TypeError))
-        self.assertThat(lambda: self.launch_test_application(True), raises(TypeError))
-        self.assertThat(lambda: self.launch_test_application(1.0), raises(TypeError))
-        self.assertThat(lambda: self.launch_test_application(object()), raises(TypeError))
-        self.assertThat(lambda: self.launch_test_application(None), raises(TypeError))
-        self.assertThat(lambda: self.launch_test_application([]), raises(TypeError))
-        self.assertThat(lambda: self.launch_test_application((None,)), raises(TypeError))

=== modified file 'autopilot/tests/unit/test_command_line_args.py'
--- autopilot/tests/unit/test_command_line_args.py	2013-05-06 23:26:22 +0000
+++ autopilot/tests/unit/test_command_line_args.py	2013-05-16 15:55:46 +0000
@@ -89,6 +89,11 @@
         self.assertThat(args.application,
             Equals(["app", "-s", "--long", "--key=val", "arg1", "arg2"]))
 
+    @patch('sys.stderr', new=StringIO())
+    @expectedFailure
+    def test_launch_command_must_specify_app(self):
+        self.parse_args("launch")
+
     @patch('autopilot.have_vis', new=lambda: True)
     def test_vis_present_when_vis_module_installed(self):
         args = self.parse_args('vis')

=== modified file 'autopilot/tests/unit/test_matchers.py'
--- autopilot/tests/unit/test_matchers.py	2013-05-05 02:39:14 +0000
+++ autopilot/tests/unit/test_matchers.py	2013-05-16 15:55:46 +0000
@@ -22,9 +22,10 @@
 
 from autopilot.introspection.dbus import DBusIntrospectionObject
 from autopilot.matchers import Eventually
-from autopilot.testcase import AutopilotTestCase
 
 import dbus
+from testscenarios import TestWithScenarios
+from testtools import TestCase
 from testtools.matchers import (
     Contains,
     Equals,
@@ -60,15 +61,15 @@
         return obj.attr
 
 
-class ObjectPatchingMatcherTests(AutopilotTestCase):
+class ObjectPatchingMatcherTests(TestCase):
     """Ensure the core functionality the matchers use is correct."""
 
     def test_default_wait_for_args(self):
-        """Ensure"""
+        """Ensure we can call wait_for with the correct arg."""
         intro_obj = make_fake_attribute_with_result(False)
         intro_obj.wait_for(False)
 
-class EventuallyMatcherTests(AutopilotTestCase):
+class EventuallyMatcherTests(TestWithScenarios, TestCase):
 
     scenarios = [
         ('callable', dict(attribute_type='callable')),
@@ -113,7 +114,7 @@
         self.assertThat(mismatch.describe(), Contains("After 1.0 seconds test"))
 
 
-class EventuallyNonScenariodTests(AutopilotTestCase):
+class EventuallyNonScenariodTests(TestCase):
 
     def test_eventually_matcher_raises_ValueError_on_unknown_kwargs(self):
         self.assertThat(lambda: Eventually(Equals(True), foo=123),

=== modified file 'autopilot/tests/unit/test_out_of_test_addcleanup.py'
--- autopilot/tests/unit/test_out_of_test_addcleanup.py	2013-05-05 02:39:14 +0000
+++ autopilot/tests/unit/test_out_of_test_addcleanup.py	2013-05-16 15:55:46 +0000
@@ -21,7 +21,7 @@
 from testtools import TestCase
 from testtools.matchers import Equals
 
-from autopilot.testcase import AutopilotTestCase
+from autopilot.globals import on_test_started
 from autopilot.utilities import addCleanup
 
 log = ''
@@ -33,12 +33,13 @@
         args and kwargs.
 
         """
-        class InnerTest(AutopilotTestCase):
+        class InnerTest(TestCase):
             def write_to_log(self, *args, **kwargs):
                 global log
                 log = "Hello %r %r" % (args, kwargs)
 
             def test_foo(self):
+                on_test_started(self)
                 addCleanup(self.write_to_log, "arg1", 2, foo='bar')
 
         InnerTest('test_foo').run()