Merge lp:~thomir-deactivatedaccount/autopilot/split-tests into lp:autopilot

[Thomi Richards]

Split tests into unit and functional tests. Make sure unit tests are run as part of the package build.

This branch splits the autopilot tests into unit tests, and functional tests. It also causes the unit tests to be run as part of the package build process. My hope is that as time goe3s on we will write more and more unit tests, and find a way to run the functional tests as part of our autolanding infrastructure.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/autopilot-ci/71/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/70/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/split-tests]

197. By Thomi Richards on 2013-05-05

Moved test that relied on gedit into the functional section. Added python-mock as a build-dep, so we can run the unit tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/autopilot-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/71

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

review: Approve (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/split-tests]

198. By Thomi Richards on 2013-05-05

revert accidental change to debian/source/format

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:198
http://jenkins.qa.ubuntu.com/job/autopilot-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/74
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/73/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:198
http://jenkins.qa.ubuntu.com/job/autopilot-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/3

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Looks good.

review: Approve

=== added file 'autopilot/tests/README'
--- autopilot/tests/README	1970-01-01 00:00:00 +0000
+++ autopilot/tests/README	2013-05-05 21:50:33 +0000
@@ -0,0 +1,4 @@
+This is the root directory for autopilot tests. The "unit" folder contains unit tests that are run when the autopilot packae builds. They must not have any external dependancies (especially not to, for example X11). The "functional" folder contains larger tests that may depend on external components.
+
+Both these folders are packages in the 'python-autopilot-tests' package.
+

=== added directory 'autopilot/tests/functional'
=== added file 'autopilot/tests/functional/__init__.py'
--- autopilot/tests/functional/__init__.py	1970-01-01 00:00:00 +0000
+++ autopilot/tests/functional/__init__.py	2013-05-05 21:50:33 +0000
@@ -0,0 +1,18 @@
+# -*- 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/>.
+#

=== renamed file 'autopilot/tests/test_ap_apps.py' => 'autopilot/tests/functional/test_ap_apps.py'
=== added file 'autopilot/tests/functional/test_application_mixin.py'
--- autopilot/tests/functional/test_application_mixin.py	1970-01-01 00:00:00 +0000
+++ autopilot/tests/functional/test_application_mixin.py	2013-05-05 21:50:33 +0000
@@ -0,0 +1,43 @@
+# -*- 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_raises_ValueError_on_unknown_kwargs(self):
+        """launch_test_application must raise ValueError when given unknown
+        keyword arguments.
+
+        """
+        fn = lambda: self.launch_test_application('gedit', arg1=123, arg2='asd')
+        self.assertThat(fn, raises(ValueError("Unknown keyword arguments: 'arg1', 'arg2'.")))
+
+    def test_launch_raises_ValueError_on_unknown_kwargs_with_known(self):
+        """launch_test_application must raise ValueError when given unknown
+        keyword arguments.
+
+        """
+        fn = lambda: self.launch_test_application('gedit', arg1=123, arg2='asd', launch_dir='/')
+        self.assertThat(fn, raises(ValueError("Unknown keyword arguments: 'arg1', 'arg2'.")))

=== renamed file 'autopilot/tests/test_autopilot_functional.py' => 'autopilot/tests/functional/test_autopilot_functional.py'
=== renamed file 'autopilot/tests/test_dbus_query.py' => 'autopilot/tests/functional/test_dbus_query.py'
=== renamed file 'autopilot/tests/test_input_stack.py' => 'autopilot/tests/functional/test_input_stack.py'
=== renamed file 'autopilot/tests/test_mouse_emulator.py' => 'autopilot/tests/functional/test_mouse_emulator.py'
=== renamed file 'autopilot/tests/test_open_window.py' => 'autopilot/tests/functional/test_open_window.py'
=== renamed file 'autopilot/tests/test_process_emulator.py' => 'autopilot/tests/functional/test_process_emulator.py'
=== added directory 'autopilot/tests/unit'
=== added file 'autopilot/tests/unit/__init__.py'
--- autopilot/tests/unit/__init__.py	1970-01-01 00:00:00 +0000
+++ autopilot/tests/unit/__init__.py	2013-05-05 21:50:33 +0000
@@ -0,0 +1,18 @@
+# -*- 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/>.
+#

=== renamed file 'autopilot/tests/test_application_mixin.py' => 'autopilot/tests/unit/test_application_mixin.py'
--- autopilot/tests/test_application_mixin.py	2013-04-23 04:15:54 +0000
+++ autopilot/tests/unit/test_application_mixin.py	2013-05-05 21:50:33 +0000
@@ -21,10 +21,7 @@
 from __future__ import absolute_import
 
 from autopilot.testcase import AutopilotTestCase
-from testtools.matchers import Is, Not, raises
-
-def dummy_addCleanup(*args, **kwargs):
-    pass
+from testtools.matchers import raises
 
 
 class ApplicationSupportTests(AutopilotTestCase):
@@ -40,19 +37,3 @@
         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.
-
-        """
-        fn = lambda: self.launch_test_application('gedit', arg1=123, arg2='asd')
-        self.assertThat(fn, raises(ValueError("Unknown keyword arguments: 'arg1', 'arg2'.")))
-
-    def test_launch_raises_ValueError_on_unknown_kwargs_with_known(self):
-        """launch_test_application must raise ValueError when given unknown
-        keyword arguments.
-
-        """
-        fn = lambda: self.launch_test_application('gedit', arg1=123, arg2='asd', launch_dir='/')
-        self.assertThat(fn, raises(ValueError("Unknown keyword arguments: 'arg1', 'arg2'.")))

=== renamed file 'autopilot/tests/test_backend.py' => 'autopilot/tests/unit/test_backend.py'
=== renamed file 'autopilot/tests/test_custom_assertions.py' => 'autopilot/tests/unit/test_custom_assertions.py'
=== renamed file 'autopilot/tests/test_custom_exceptions.py' => 'autopilot/tests/unit/test_custom_exceptions.py'
=== renamed file 'autopilot/tests/test_matchers.py' => 'autopilot/tests/unit/test_matchers.py'
=== renamed file 'autopilot/tests/test_out_of_test_addcleanup.py' => 'autopilot/tests/unit/test_out_of_test_addcleanup.py'
=== renamed file 'autopilot/tests/test_pick_backend.py' => 'autopilot/tests/unit/test_pick_backend.py'
=== renamed file 'autopilot/tests/test_platform.py' => 'autopilot/tests/unit/test_platform.py'
=== modified file 'debian/control'
--- debian/control	2013-05-03 00:15:26 +0000
+++ debian/control	2013-05-05 21:50:33 +0000
@@ -10,6 +10,7 @@
                python (>= 2.6),
                python-dbus,
                python-debian,
+               python-mock,
                python-setuptools,
                python-sphinx,
                python-testtools,

=== modified file 'debian/rules'
--- debian/rules	2013-04-22 02:23:52 +0000
+++ debian/rules	2013-05-05 21:50:33 +0000
@@ -11,3 +11,5 @@
 	sphinx-build -b html -W  docs/ docs/_build/html/
 	dh_auto_build
 
+override_dh_auto_test:
+	python -m testtools.run discover autopilot.tests.unit