lp:~brendan-donegan/checkbox/bug1084601

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:checkbox at revision 1880

Zygmunt Krynicki (community): Approve on 2013-01-14

Brendan Donegan (community): Needs Resubmitting on 2013-01-14

Diff: 406 lines (+184/-51)

3 files modified

debian/changelog (+5/-0)
jobs/bluetooth.txt.in (+15/-1)
jobs/suspend.txt.in (+164/-50)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1084601: bluetooth tests don't rfkill unblock before running.

Medium

Fix Released

Link a bug report

Related blueprints

1866. By Brendan Donegan on 2013-01-14

Fixed couple of typo's pointed out by zyga

1865. By Brendan Donegan on 2013-01-11

Merged from trunk.

1864. By Brendan Donegan on 2013-01-10

Updated bluetooth jobs to check for hard and soft block and warn about them before testing, and remove the soft block if possible.

1863. By Brendan Donegan on 2013-01-02

jobs/bluetooth.txt.in, jobs/suspend.txt.in - unblock Bluetooth hardware
before running any Bluetooth tests to avoid these failing (LP: #1084601)

1862. By Zygmunt Krynicki on 2013-01-02

Fix pattern generator

The simple/primitive grep that was cutting away the indent was
actually removing genuine data when the output formatting changed.

Signed-off-by: Zygmunt Krynicki <email address hidden>

1861. By Brendan Donegan on 2013-01-02

"[r=zkrynicki][bug=1092143][author=brendan-donegan] automatic merge by tarmac"

1860. By Zygmunt Krynicki on 2013-01-02

Fix lookup of checkbox tree relative to plainbox module

Signed-off-by: Zygmunt Krynicki <email address hidden>

1859. By Zygmunt Krynicki on 2013-01-02

Manual merge of plainbox unittest fixes

Tarmac makes launchpad smart server barf on this branch:

Using tree in /home/zyga/.cache/tarmac/branches/checkbox/trunk
Firing tarmac_pre_merge hookphase:Apply phase 2/3
Preparing to merge lp:~zkrynicki/checkbox/zyga
An error occurred trying to merge lp:checkbox: Server sent an unexpected error: ('error', 'GhostRevisionsHaveNoRevno', 'Could not determine revno for {<email address hidden>} because its ancestry shows a ghost at {launchpad_translations_on_behalf_of_checkbox-dev-20121225043543-tyj9c3lj1jiyf6mw}')
Traceback (most recent call last):
  File "./bin/tarmac", line 6, in <module>
    main()
  File "/home/zyga/tarmac/tarmac/bin/__init__.py", line 30, in main
    registry.run(args)
  File "/home/zyga/tarmac/tarmac/bin/registry.py", line 60, in run
    self._run(args)
  File "/home/zyga/tarmac/tarmac/bin/registry.py", line 48, in _run
    run_bzr(args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/zyga/tarmac/tarmac/bin/commands.py", line 370, in run
    self._do_merges(branch)
  File "/home/zyga/tarmac/tarmac/bin/commands.py", line 212, in _do_merges
    str(proposal.reviewed_revid))
  File "<string>", line 4, in revision_id_to_revno_read_locked
  File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 3880, in revision_id_to_revno
    self._remote_path(), revision_id)
  File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 75, in _call
    self._translate_error(err, **err_context)
  File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 3452, in _translate_error
    self.repository._translate_error(err, branch=self, **context)
  File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 1347, in _translate_error
    self.bzrdir._translate_error(err, repository=self, **context)
  File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 491, in _translate_error
    _translate_error(err, bzrdir=self, **context)
  File "/usr/lib/python2.7/dist-packages/bzrlib/remote.py", line 4189, in _translate_error
    raise errors.UnknownErrorFromSmartServer(err)
bzrlib.errors.UnknownErrorFromSmartServer: Server sent an unexpected error: ('error', 'GhostRevisionsHaveNoRevno', 'Could not determine revno for {<email address hidden>} because its ancestry shows a ghost at {launchpad_translations_on_behalf_of_checkbox-dev-20121225043543-tyj9c3lj1jiyf6mw}')

1858. By Launchpad Translations on behalf of checkbox-dev on 2012-12-25

Launchpad automatic translations update.

1857. By Sylvain Pineau on 2012-12-19

Plainbox - Added the RFC822 exporter