Merge lp:~thomir-deactivatedaccount/autopilot/fix-packaging-bugs into lp:autopilot

[Thomi Richards]

Unmerged revisions

=== modified file 'autopilot/tests/functional/test_autopilot_functional.py'
--- autopilot/tests/functional/test_autopilot_functional.py	2013-05-05 02:39:14 +0000
+++ autopilot/tests/functional/test_autopilot_functional.py	2013-05-15 05:41:25 +0000
@@ -93,10 +93,6 @@
             )
 
         environment_patch = dict(DISPLAY=':0')
-        # Set PYTHONPATH always, since we can't tell what sys.path will be in the
-        # child process.
-        environment_patch['PYTHONPATH'] = ap_base_path
-
         bin_path = os.path.join(ap_base_path, 'bin', 'autopilot')
         if not os.path.exists(bin_path):
             bin_path = subprocess.check_output(['which', 'autopilot']).strip()

=== modified file 'bin/autopilot'
--- bin/autopilot	2013-05-06 23:21:59 +0000
+++ bin/autopilot	2013-05-15 05:41:25 +0000
@@ -226,12 +226,13 @@
     return TestSuite(requested_tests.values())
 
 
-def patch_python_path():
+def maybe_patch_python_path():
     """Prepend the current directory to sys.path to ensure that we can load & run
-    autopilot tests if the caller is in the parent directory.
+    autopilot tests if the caller is in the parent directory, but only if we're
+    not somewhere in /usr/...
 
     """
-    if os.getcwd() not in sys.path:
+    if os.getcwd() not in sys.path and not os.getcwd().startswith('/usr/'):
         sys.path.insert(0, os.getcwd())
 
 
@@ -302,5 +303,5 @@
 
 
 if __name__ == "__main__":
-    patch_python_path()
+    maybe_patch_python_path()
     main()

=== modified file 'debian/control'
--- debian/control	2013-05-09 16:26:45 +0000
+++ debian/control	2013-05-15 05:41:25 +0000
@@ -35,6 +35,8 @@
          udev,
 Recommends: libautopilot-gtk (>= 1.3),
             libautopilot-qt (>= 1.3),
+            python-autopilot-trace,
+            recordmydesktop,
 Description: Utility to write and run integration tests easily
  The autopilot engine enables to ease the writing of python tests
  for your application manipulating your inputs like the mouse and
@@ -97,8 +99,10 @@
 Depends: ${misc:Depends},
          ${python:Depends},
          python-autopilot,
+         libautopilot-gtk,
          libautopilot-qt,
          python-windowmocker,
+         recordmydesktop,
 Description: Tests for the autopilot functional test tool.
  This package contains tests for the python-autopilot package.
  You can use this package to verify that autopilot is functioning