Merge lp://staging/~kissiel/checkbox/extend-resume into lp://staging/checkbox

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4424
Merged at revision: 4420
Proposed branch: lp://staging/~kissiel/checkbox/extend-resume
Merge into: lp://staging/checkbox
Diff against target: 268 lines (+126/-27)
6 files modified
checkbox-touch/checkbox-touch.qml (+9/-5)
checkbox-touch/components/CheckboxTouchApplication.qml (+2/-2)
checkbox-touch/components/ResumeSessionPage.qml (+30/-2)
checkbox-touch/py/checkbox_touch.py (+6/-2)
checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py (+79/-15)
plainbox/plainbox/impl/session/assistant.py (+0/-1)
To merge this branch: bzr merge lp://staging/~kissiel/checkbox/extend-resume
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Pierre Equoy Approve
Review via email: mp+298901@code.staging.launchpad.net

Description of the change

This MR brings an option to pass/skip/fail last run test on the resume screen

It fixes https://bugs.launchpad.net/checkbox-converged/+bug/1597993.

To test it, start a session using c-b-c, interrupt it, and play around with different resume options.

To post a comment you must log in.
Revision history for this message
Pierre Equoy (pieq) wrote :

Two comments:

1. Could it be possible to add the name of the job in the dialogbox?

That is, instead of:

-----------------------------
What to do with the last job?

[Pass]
[Skip]
[Fail]
-----------------------------

Having:

-----------------------------
What to do with the last job?
(“suspend/suspend_advanced”)

[Pass]
[Skip]
[Fail]
-----------------------------

Either display the job summary if avaible or else the job id.

2. When you select something from the new dialogbox, the screen goes back to the resume screen for a while before continuing, and the "Delete sessions" button seems clickable (at least I clicked it, but I don't think it actually deleted the sessions). It would be better to display some sort of "Loading" thing to let the user know something is happening in the background.

review: Needs Fixing
Revision history for this message
Pierre Equoy (pieq) wrote :

Both issues mentioned in my previous comment have been fixed.

Thanks for that Maciek!

+1

review: Approve
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Thanks! Let's land it!

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :
Download full text (5.4 KiB)

The attempt to merge lp:~kissiel/checkbox/extend-resume into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.08user 0.07system 0:04.31elapsed 3%CPU (0avgtext+0avgdata 10248maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8285minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 45.38user 16.62system 1:11.23elapsed 87%CPU (0avgtext+0avgdata 96608maxresident)k
[precise] (timing) 0inputs+19072outputs (0major+3202772minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.68user 0.13system 0:00.82elapsed 98%CPU (0avgtext+0avgdata 48344maxresident)k
[precise-testing] (timing) 0inputs+1384outputs (0major+22228minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 31.15user 0.19system 0:31.37elapsed 99%CPU (0avgtext+0avgdata 150736maxresident)k
[precise-testing] (timing) 0inputs+1376outputs (0major+40774minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.00user 0.02system 0:00.04elapsed 75%CPU (0avgtext+0avgdata 2184maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2378minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.00user 0.14system 0:01.18elapsed 97%CPU (0avgtext+0avgdata 46348maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14257minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.24user 0.04system 0:00.29elapsed 96%CPU (0avgtext+0avgdata 14556maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+6073minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 53.21user 1.28system 0:54.65elapsed 99%CPU (0avgtext+0avgdata 199840maxresident)k
[precise-testing] (timing) 0inputs+3288outputs (0major+201314minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 142.36user 0.56system 2:23.26elapsed 99%CPU (0avgtext+0avgdata 182812maxresident)k
[precise-testing] (timing) 0inputs+43208outputs (0major+56886minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] (timing)...

Read more...

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Tarmac my dear, one more try please <3

review: Approve

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