lp://staging/~kissiel/checkbox/fix-1386093

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/checkbox at revision 3510

Sylvain Pineau (community): Approve on 2014-12-18

Diff: 48 lines (+8/-2)

3 files modified

providers/plainbox-provider-checkbox/data/resolution_test.qml (+6/-0)
providers/plainbox-provider-checkbox/jobs/graphics-legacy.txt.in (+1/-1)
providers/plainbox-provider-checkbox/jobs/graphics.txt.in (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1386093: graphics/1_screen_resolution_xxx fail always

Medium

Fix Released

Link a bug report

Related blueprints

3509. By Maciej Kisielewski on 2014-12-18

providers/plainbox-provider-checkbox: remove timeout call in resolution_test

This patch removes calling of qmlscene within timeout regim for jobs using
resolution_test.qml.

Fixes: https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1386093
Signed-off-by: Maciej Kisielewski <email address hidden>

3508. By Maciej Kisielewski on 2014-12-18

providers/plainbox-provider-checkbox: make resolution_test.qml timeout itself

This patch makes resolution_test.qml quit itself after 5 seconds. This makes
use of timeout command unnecessary.

Fixes: https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1386093
Signed-off-by: Maciej Kisielewski <email address hidden>

3507. By Sylvain Pineau on 2014-12-16

"automatic merge of lp:~sylvain-pineau/checkbox/fix-1403070/ by tarmac [r=zkrynicki][bug=1403070][author=sylvain-pineau]"

3506. By Zygmunt Krynicki on 2014-12-15

"automatic merge of lp:~zkrynicki/checkbox/extcmd-fixes/ by tarmac [r=sylvain-pineau][bug=1402675,1402680,1402710][author=zkrynicki]"

3505. By Rod Smith on 2014-12-15

"automatic merge of lp:~rodsmith/checkbox/not-found-error/ by tarmac [r=zkrynicki][bug=1402810][author=rodsmith]"

3504. By Sylvain Pineau on 2014-12-15

"automatic merge of lp:~sylvain-pineau/checkbox/fix-1362449/ by tarmac [r=][bug=1362449][author=sylvain-pineau]"

3503. By Launchpad Translations on behalf of checkbox-dev on 2014-12-13

Launchpad automatic translations update.

3502. By Zygmunt Krynicki on 2014-12-12

"automatic merge of lp:~zkrynicki/checkbox/fix-1401996/ by tarmac [r=roadmr][bug=1401996][author=zkrynicki]"

3501. By Zygmunt Krynicki on 2014-12-12

"automatic merge of lp:~zkrynicki/checkbox/fix-1401927/ by tarmac [r=sylvain-pineau][bug=1401927][author=zkrynicki]"

3500. By Zygmunt Krynicki on 2014-12-12

"automatic merge of lp:~zkrynicki/checkbox/attachment-fixes/ by tarmac [r=sylvain-pineau][bug=1401886][author=zkrynicki]"