Merge lp://staging/autopilot into lp://staging/autopilot/1.5

Proposed by Christopher Lee
Status: Merged
Approved by: Selene ToyKeeper
Approved revision: 572
Merged at revision: 524
Proposed branch: lp://staging/autopilot
Merge into: lp://staging/autopilot/1.5
Diff against target: 328 lines (+74/-49)
10 files modified
autopilot/_logging.py (+5/-4)
autopilot/_video.py (+2/-2)
autopilot/application/_launcher.py (+7/-4)
autopilot/content.py (+11/-2)
autopilot/introspection/types.py (+7/-30)
autopilot/tests/unit/test_platform.py (+2/-2)
autopilot/tests/unit/test_utilities.py (+16/-0)
autopilot/utilities.py (+20/-0)
debian/control (+2/-0)
docs/otto.py (+2/-5)
To merge this branch: bzr merge lp://staging/autopilot
Reviewer Review Type Date Requested Status
Martin Pitt (community) packaging Approve
Selene ToyKeeper (community) Approve
Max Brustkern (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+279219@code.staging.launchpad.net

Commit message

Stops attempts to access NoneType instead of bytes''. Considered a workaround, fixed in newer testtools.

Description of the change

Provide a workaround due to older versions of testtools on vivid. Stops attempts to access NoneType instead of bytes''

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Max Brustkern (nuclearbob) wrote :

This looks good to me, but I haven't run tests yet.

review: Approve
Revision history for this message
Selene ToyKeeper (toykeeper) wrote :

Approving since it's the same as the other already-approved MP.

review: Approve
Revision history for this message
Max Brustkern (nuclearbob) wrote :

There are sphinx build problems in xenial with docs/api/autopilot.emulators.rst and docs/tutorial/getting_started.rst

I'll look into a resolution for that.

Revision history for this message
Max Brustkern (nuclearbob) wrote :

The ".. otto::" lines are creating problems. I suspect maybe something we're using there work differently in the current version of sphinx, so I'll look for API changes.

Revision history for this message
Max Brustkern (nuclearbob) wrote :

This line in otto.py is the problem:
image_container.children.append(nodes.image(uri='/images/otto-64.png'))

Revision history for this message
Max Brustkern (nuclearbob) wrote :

If I remove that line, sphinx builds fine, but I get 8 test failures around datetime stuff that don't appear on wily. I'll look into that more.

Revision history for this message
Max Brustkern (nuclearbob) wrote :
Download full text (18.1 KiB)

I get these failures running tests under python3.5 on xenial, while they pass if run under 3.4:
/usr/lib/python3/dist-packages/unittest2/loader.py:367: PyGIWarning: UbuntuAppLaunch was imported without specifying a version first. Use gi.require_version('UbuntuAppLaunch', '2') before import to ensure that the right version gets loaded.
  tests = list(self._find_tests(start_dir, pattern))

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1

** (process:27668): WARNING **: Unable to connect to Upstart bus: Error spawning command line 'dbus-launch --autolaunch=435350870788ae3025aa21ed00000538 --binary-syntax --close-stderr': Child process exited with code 1
Followed stream is empty.
Could not add content object 'autopilot.tests.unit.test_content.FileFollowerTests.test_follow_file_does_not_raise_on_IOError-1' due to IO Error: [Errno 13] Permission denied: '/tmp/tmpm6ggk9mx'
Could not add content object 'autopilot.tests.unit.test_content.FileFollowerTests.test_follow_file_returns_empty_content_object_on_error-1' due to IO Error: [Errno 13] Permission denied: '/tmp/tmpgqe4twb0'
Followed stream is empty.
Followed stream is empty.
INFO:root:************************************************************
INFO:root:Starting test Test.id
INFO:autopilot.tests.unit.test_logging:autopilot.tests.unit.test_logging.TestCaseLoggingFixtureTests.test_test_log_is_added-1
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
INFO:root:Autopilot Source Version: 1.5.0
WARNING:autopil...

Revision history for this message
Max Brustkern (nuclearbob) wrote :

The same problems (sphinx and test failures) appear when building lp:autopilot/1.5 under xenial. I think this is an issue with the transition to python3.5

Revision history for this message
Max Brustkern (nuclearbob) wrote :

Changing debian/rules to force python3.4 for the testing portion allows that to work, but I can't get sphinx to finish building yet.

lp://staging/autopilot updated
573. By Christopher Lee

Fix build issues on Xenial. Incl. simplifying DateTime. Fixes: https://bugs.launchpad.net/bugs/1524000.

Approved by Max Brustkern, PS Jenkins bot.

574. By Christopher Lee

Fix missing dep packaging.

Approved by PS Jenkins bot.

Revision history for this message
Martin Pitt (pitti) wrote :

(Trivial) packaging change ack, python3-tz is in main and no other changes in the packaging. Thanks!

review: Approve (packaging)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches