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

[Thomi Richards]

Split vis tool.

Split the autopilot vis tool into a separate package.

[Michael Terry (mterry)]

Seems reasonable, but why the 3.0 (quilt) change? Our daily release process likes packages to be in format 1.0.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

182. By Thomi Richards on 2013-04-30

Roll back change to debian/source/format.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

=== modified file 'bin/autopilot'
--- bin/autopilot	2013-04-25 22:53:20 +0000
+++ bin/autopilot	2013-04-30 18:26:25 +0000
@@ -132,12 +132,13 @@
     parser_list.add_argument("suite", nargs="+",
                              help="Specify test suite(s) to run.")
 
-    parser_vis = subparsers.add_parser('vis',
-                                      help="Open the Autopilot visualiser tool")
-    parser_vis.add_argument('-v', '--verbose', required=False, default=False,
-                            action='count', help="Show autopilot log messages. \
-                            Set twice to also log data useful for debugging \
-                            autopilot itself.")
+    if have_vis():
+        parser_vis = subparsers.add_parser('vis',
+                                          help="Open the Autopilot visualiser tool")
+        parser_vis.add_argument('-v', '--verbose', required=False, default=False,
+                                action='count', help="Show autopilot log messages. \
+                                Set twice to also log data useful for debugging \
+                                autopilot itself.")
 
     parser_launch = subparsers.add_parser('launch',
                             help="Launch an application with introspection enabled")
@@ -291,7 +292,6 @@
 
 def load_test_suite_from_name(test_names):
     """Returns a test suite object given a dotted test names."""
-    patch_python_path()
     loader = TestLoader()
     if isinstance(test_names, basestring):
         test_names = list(test_names)
@@ -385,6 +385,15 @@
         exit(1)
 
 
+def have_vis():
+    """Return true if the vis package is installed."""
+    try:
+        from autopilot.vis import vis_main
+        return True
+    except ImportError:
+        return False
+
+
 def run_vis(args):
     setup_logging(args.verbose)
     # importing this requires that DISPLAY is set. Since we don't always want
@@ -415,6 +424,7 @@
 
 
 if __name__ == "__main__":
+    patch_python_path()
     if not check_depends():
         exit(1)
     main()

=== modified file 'debian/control'
--- debian/control	2013-04-23 03:15:28 +0000
+++ debian/control	2013-04-30 18:26:25 +0000
@@ -46,6 +46,19 @@
  keyboard. It also provides a lot of utilities linked to the X server
  and detecting applications.
 
+Package: python-autopilot-vis
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python-autopilot,
+         python-dbus,
+         python-qt4,
+         python-qt4-dbus,
+Description: The visualisation application for Autopilot.
+ The Autopilot vis tool allows you to inspect an application introspectioin
+ tree. It is a useful tool for test authors, but not required to run autopilot
+ tests.
+
 Package: python-autopilot-tests
 Architecture: all
 Depends: ${shlibs:Depends},

=== added file 'debian/python-autopilot-vis.pyinstall'
--- debian/python-autopilot-vis.pyinstall	1970-01-01 00:00:00 +0000
+++ debian/python-autopilot-vis.pyinstall	2013-04-30 18:26:25 +0000
@@ -0,0 +1,1 @@
+autopilot/vis/*.py

=== modified file 'debian/python-autopilot.pyinstall'
--- debian/python-autopilot.pyinstall	2013-04-17 21:38:27 +0000
+++ debian/python-autopilot.pyinstall	2013-04-30 18:26:25 +0000
@@ -4,4 +4,3 @@
 autopilot/introspection/*.py
 autopilot/matchers/*.py
 autopilot/process/*.py
-autopilot/vis/*.py