Merge into temp-dev : rmd-leaks-1187856 : Code : Autopilot

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-04-22	Approve on 2014-04-28
Thomi Richards (community)		2014-04-22	Approve on 2014-04-28
Max Brustkern		2014-04-22	Pending
Review via email: mp+216783@code.launchpad.net

Revision history for this message

Max Brustkern (nuclearbob) wrote on 2014-03-26: Posted in a previous version of this proposal

#

Looks good to me.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-03-26: Posted in a previous version of this proposal

#

Would like to see another test run where the functional tests don't hang. Can you re-trigger that please?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-04-08: Posted in a previous version of this proposal

#

Hi Corey - this branch still hangs in the test run. Please investigate.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:461
http://jenkins.qa.ubuntu.com/job/autopilot-ci/678/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/404/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/406/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/313/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4964/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-15: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:465
http://jenkins.qa.ubuntu.com/job/autopilot-ci/688/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/414/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/416/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/323/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5052/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4485/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-17: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-17: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-17: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/autopilot-ci/698/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/333/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5094/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4525/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-17: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Corey Goldberg (coreygoldberg) wrote on 2014-04-17: Posted in a previous version of this proposal

#

Download full text (4.4 KiB)

Test Name
Duration
Age
<<< autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(increase size)
Stack Trace

_StringException: Empty attachments:
/var/log/syslog
process-stdout

process-return-code: {{{1}}}
process-stderr: {{{window-mocker: cannot connect to X server}}}
test-log: {{{
17:45:17.492 INFO globals:59 - ************************************************************
17:45:17.493 INFO globals:60 - Starting test autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry (increase size)
17:45:17.553 WARNING testcase:157 - Process manager backend unavailable, application snapshot support disabled.
17:45:17.554 INFO testcase:258 - Attempting to launch application 'window-mocker' with arguments '' as a normal process
17:45:17.578 INFO _launcher:255 - Launching process: ['/usr/bin/window-mocker', '-testability']
17:45:19.330 INFO _launcher:368 - waiting for process to exit.
17:45:19.337 INFO _launcher:391 - Killing process 3503
17:45:19.341 INFO _launcher:394 - Appears process has already exited.
}}}

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/autopilot/tests/functional/test_process_emulator.py", line 171, in test_resize_window_must_update_width_and_height_geometry
    window = self.start_mock_window()
  File "/usr/lib/python2.7/dist-packages/autopilot/tests/functional/test_process_emulator.py", line 155, in start_mock_window
    app_type='qt'
  File "/usr/lib/python2.7/dist-packages/autopilot/testcase.py", line 264, in launch_test_application
    return self._launch_test_application(launcher, application, *arguments)
  File "/usr/lib/python2.7/dist-packages/autopilot/testcase.py", line 367, in _launch_test_application
    application_name=application_name,
  File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 154, in get_proxy_object_for_existing_process
    process
  File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 274, in _get_dbus_addresses_from_search_parameters
    % return_code
ProcessSearchError: Process exited with exit code: 1

1.8 sec 5
<<< autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(decrease size)
Stack Trace

_StringException: Empty attachments:
/var/log/syslog
process-stdout

process-return-code: {{{1}}}
process-stderr: {{{window-mocker: cannot connect to X server}}}
test-log: {{{
17:45:19.367 INFO globals:59 - ************************************************************
17:45:19.368 INFO globals:60 - Starting test autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry (decrease size)
17:45:19.433 WARNING testcase:157 - Process manager backend unavailable, application snapshot support disabled.
17:45:19.434 INFO testcase:258 - Attempting to launch application 'window-mocker' with arguments '' as a normal process
17:45:19.452 INFO _launcher:255 - Launching process: ['/usr/bin/window-mocker', '-testability']
17...

Test Name   
Duration   
Age   
<<< autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(increase size) 
Stack Trace

_StringException: Empty attachments:
  /var/log/syslog
  process-stdout

process-return-code: {{{1}}}
process-stderr: {{{window-mocker: cannot connect to X server}}}
test-log: {{{
17:45:17.492 INFO globals:59 - ************************************************************
17:45:17.493 INFO globals:60 - Starting test autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry (increase size)
17:45:17.553 WARNING testcase:157 - Process manager backend unavailable, application snapshot support disabled.
17:45:17.554 INFO testcase:258 - Attempting to launch application 'window-mocker' with arguments '' as a normal process
17:45:17.578 INFO _launcher:255 - Launching process: ['/usr/bin/window-mocker', '-testability']
17:45:19.330 INFO _launcher:368 - waiting for process to exit.
17:45:19.337 INFO _launcher:391 - Killing process 3503
17:45:19.341 INFO _launcher:394 - Appears process has already exited.
}}}

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/autopilot/tests/functional/test_process_emulator.py", line 171, in test_resize_window_must_update_width_and_height_geometry
    window = self.start_mock_window()
  File "/usr/lib/python2.7/dist-packages/autopilot/tests/functional/test_process_emulator.py", line 155, in start_mock_window
    app_type='qt'
  File "/usr/lib/python2.7/dist-packages/autopilot/testcase.py", line 264, in launch_test_application
    return self._launch_test_application(launcher, application, *arguments)
  File "/usr/lib/python2.7/dist-packages/autopilot/testcase.py", line 367, in _launch_test_application
    application_name=application_name,
  File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 154, in get_proxy_object_for_existing_process
    process
  File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 274, in _get_dbus_addresses_from_search_parameters
    % return_code
ProcessSearchError: Process exited with exit code: 1

1.8 sec	5
<<< autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(decrease size) 
Stack Trace

_StringException: Empty attachments:
  /var/log/syslog
  process-stdout

process-return-code: {{{1}}}
process-stderr: {{{window-mocker: cannot connect to X server}}}
test-log: {{{
17:45:19.367 INFO globals:59 - ************************************************************
17:45:19.368 INFO globals:60 - Starting test autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry (decrease size)
17:45:19.433 WARNING testcase:157 - Process manager backend unavailable, application snapshot support disabled.
17:45:19.434 INFO testcase:258 - Attempting to launch application 'window-mocker' with arguments '' as a normal process
17:45:19.452 INFO _launcher:255 - Launching process: ['/usr/bin/window-mocker', '-testability']
17:45:21.111 INFO _launcher:368 - waiting for process to exit.
17:45:21.117 INFO _launcher:391 - Killing process 3509
17:45:21.121 INFO _launcher:394 - Appears process has already exited.
}}}

traceback-1: {{{
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/autopilot/tests/functional/test_process_emulator.py", line 171, in test_resize_window_must_update_width_and_height_geometry
    window = self.start_mock_window()
  File "/usr/lib/python2.7/dist-packages/autopilot/tests/functional/test_process_emulator.py", line 155, in start_mock_window
    app_type='qt'
  File "/usr/lib/python2.7/dist-packages/autopilot/testcase.py", line 264, in launch_test_application
    return self._launch_test_application(launcher, application, *arguments)
  File "/usr/lib/python2.7/dist-packages/autopilot/testcase.py", line 367, in _launch_test_application
    application_name=application_name,
  File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 154, in get_proxy_object_for_existing_process
    process
  File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 274, in _get_dbus_addresses_from_search_parameters
    % return_code
ProcessSearchError: Process exited with exit code: 1
}}}

1.8 sec	5

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-18: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/autopilot-ci/700/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/428/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4535/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-18: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-18: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-18: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/autopilot-ci/704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/432/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/339/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4541/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-21: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-23:

#

FAILED: Continuous integration, rev:479
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/~coreygoldberg/autopilot/rmd-leaks-1187856/+merge/216783/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/4/rebuild

FAILED: Continuous integration, rev:479
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/~coreygoldberg/autopilot/rmd-leaks-1187856/+merge/216783/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-trusty-amd64-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-trusty-amd64-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-trusty-i386-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-trusty-i386-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-autopilot/174
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4225/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty-autopilot/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5150
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4579
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4579/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6449/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6265

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-04-28:

#

LGTM

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-28:

#

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/~coreygoldberg/autopilot/rmd-leaks-1187856/+merge/216783/+edit-commit-message

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2014-04-28:

#

review: Approve (continuous-integration)

 === modified file 'autopilot/globals.py'
 --- autopilot/globals.py	2014-03-05 23:17:21 +0000
 +++ autopilot/globals.py	2014-04-22 21:15:06 +0000
@@ -30,6 +30,7 @@
  from autopilot._debug import DebugProfile
  from autopilot.utilities import LogFormatter, CleanupRegistered
  from testtools.content import text_content
++import signal
  import subprocess
  import os.path
  import logging
@@ -167,9 +168,9 @@
          file."""
          if self._test_passed:
--            # We use kill here because we don't want the recording app to start
--            # encoding the video file (since we're removing it anyway.)
--            self._capture_process.kill()
++            # SIGABRT terminates the program and removes
++            # the specified output file.
++            self._capture_process.send_signal(signal.SIGABRT)
              self._capture_process.wait()
          else:
              self._capture_process.terminate()
 === modified file 'autopilot/tests/functional/test_autopilot_functional.py'
 --- autopilot/tests/functional/test_autopilot_functional.py	2014-03-17 01:28:29 +0000
 +++ autopilot/tests/functional/test_autopilot_functional.py	2014-04-22 21:15:06 +0000
@@ -20,6 +20,7 @@
  from __future__ import absolute_import
++import glob
  import os
  import os.path
  import re
@@ -494,6 +495,42 @@
          self.assertThat(os.path.exists(video_file_path), Equals(False))
      @skipIf(platform.model() != "Desktop", "Only suitable on Desktop (VidRec)")
++    def test_no_video_session_dir_saved_for_passed_test(self):
++        """RecordMyDesktop should clean up its session files in tmp dir."""
++        dir_pattern = '/tmp/rMD-session*'
++        original_session_dirs = glob.glob(dir_pattern)
++
++        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.assertTrue(True)
++            """)
++        )
++
++        code, output, error = self.run_autopilot(["run", "-r", "tests"])
++
++        self.assertThat(code, Equals(0))
++
++        session_dirs = glob.glob(dir_pattern)
++        try:
++            new_session_dirs = \
++                list(set(session_dirs) - set(original_session_dirs))
++            leftover_session = new_session_dirs.pop()
++        except IndexError:
++            leftover_session = None
++
++        self.assertEqual(leftover_session, None)
++        if leftover_session is not None:
++            self.addCleanup(remove_if_exists, leftover_session)
++
++    @skipIf(platform.model() != "Desktop", "Only suitable on Desktop (VidRec)")
      def test_no_video_for_nested_testcase_when_parent_and_child_fail(self):
          """Test recording must not create a new recording for nested testcases
          where both the parent and the child testcase fail.
 === modified file 'debian/changelog'
 --- debian/changelog	2014-04-15 00:12:05 +0000
 +++ debian/changelog	2014-04-22 21:15:06 +0000
@@ -1,3 +1,11 @@
++autopilot (1.4+14.04.20140416-0ubuntu1) trusty; urgency=low
++
++  [ Francis Ginther ]
++  * Revert r480 to restore python2 packages as autopilot-touch
++    dependencies as not all tests have been updated. (LP: #1308661)
++
++ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 16 Apr 2014 19:55:48 +0000
++
  autopilot (1.4+14.04.20140415-0ubuntu1) trusty; urgency=low
    [ Michael Terry ]
 === modified file 'debian/control'
 --- debian/control	2014-04-02 19:32:40 +0000
 +++ debian/control	2014-04-22 21:15:06 +0000
@@ -144,6 +144,8 @@
           libautopilot-qt (>= 1.4),
           python3-autopilot,
           python3-evdev,
++         python-autopilot,
++         python-evdev,
           fbset,
  Description: Autopilot support for the ubuntu Touch platform
   This metapackage exists to depend on the packages needed to install and use

Autopilot

Merge lp:~coreygoldberg/autopilot/rmd-leaks-1187856 into lp:~autopilot/autopilot/temp-dev

Commit message

Description of the change

Preview Diff

Subscribers