Checkbox

Merge lp://staging/~kissiel/checkbox/touch-2-converged into lp://staging/checkbox

  1. touch-2-converged
  2. Merge into trunk
Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 4521
Merged at revision: 4510
Proposed branch: lp://staging/~kissiel/checkbox/touch-2-converged
Merge into: lp://staging/checkbox
Diff against target: 1806 lines (+433/-442)
27 files modified
.bzrignore (+7/-7)
converged/.gitignore (+1/-1)
converged/Makefile (+6/-6)
converged/README.rst (+11/-11)
converged/build-me (+15/-15)
converged/checkbox-converged.qml (+10/-10)
converged/checkbox-converged.qmlproject (+1/-1)
converged/checkbox-converged.svg (+2/-2)
converged/components/AboutPage.qml (+5/-4)
converged/components/QmlConfinedPage.qml (+1/-1)
converged/components/QmlNativePage.qml (+1/-1)
converged/confinement/generate.py (+3/-3)
converged/confinement/plainbox-confined-shell.qml (+2/-2)
converged/get-libs (+3/-2)
converged/po/checkbox-converged.pot (+293/-304)
converged/py/converged_app.py (+13/-13)
converged/py/embedded_providers.py (+2/-2)
converged/py/sudo_with_pass_ctrl.py (+1/-1)
converged/requirements/container-tests-touch-unit-tests (+2/-2)
converged/tests/autopilot/autopilot-provider/manage.py (+3/-3)
converged/tests/autopilot/autopilot-provider/units/autopilot.pxu (+24/-24)
converged/tests/autopilot/checkbox_converged/__init__.py (+5/-5)
converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py (+11/-11)
converged/tests/autopilot/checkbox_converged/test_launchers.py (+5/-5)
converged/tests/autopilot/checkbox_converged/test_sudo_tests.py (+4/-4)
converged/tests/autopilot/launchers/full-auto (+1/-1)
converged/tests/autopilot/run (+1/-1)
To merge this branch: bzr merge lp://staging/~kissiel/checkbox/touch-2-converged
Reviewer Review Type Date Requested Status
Maciej Kisielewski (community) Needs Resubmitting
Paul Larson Approve
Sylvain Pineau (community) Needs Information
Review via email: mp+305597@code.staging.launchpad.net

Description of the change

This MR renames last bits of checkbox-touch to checkbox-converged.

Best way to test it is autopilot suite(s)

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Two questions, see below.

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

> Two questions, see below.

from IRC:

15:21 < kissiel> spineau1: so my thinking behind 'converged' only is that it's shorter, and I cannot see
                 this colliding with anything :)
15:21 < kissiel> spineau1: and logger reflects that as it uses directory structure
15:22 < spineau1> kissiel: I was not sure if both were intended
15:22 < kissiel> spineau1: cd checkbox/checkbox-$SOMETHING is redundant if we have everything in the tree
15:22 < kissiel> spineau1: I just kept the tree structure
15:23 < spineau1> kissiel: well it's a matter of weeks now before splitting all those folder to their
                  own repos
15:23 < kissiel> spineau1: once we pull pieces into seperate projects that whole bit would be absent
15:23 < kissiel> yeah, exactly
15:23 < spineau1> hehe

Revision history for this message
Paul Larson (pwlars) wrote :

I hit a failure with the autopilot tests, but I think it could be just because it was too slow. See what you think:
https://www.irccloud.com/pastebin/9qnRlouc/

The other question I have is about whether this also needs packaging changes.

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

I already ask Maciej to take care of both:

https://code.launchpad.net/~checkbox-dev/checkbox/ppa-packaging-checkbox-converged
https://code.launchpad.net/~checkbox-dev/checkbox/ppa-packaging-checkbox-converged-trusty

Ideally I'd like to land this branch after the next release to stable.

Revision history for this message
Paul Larson (pwlars) wrote :

All tests pass for me now, +1 but remember that we'll need to fix up the daily autopilot job

Ran 22 tests in 2426.253s
OK

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

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in converged/build-me

lp://staging/~kissiel/checkbox/touch-2-converged updated
4510. By Maciej Kisielewski

converged: rename touch to converged in python bits

Signed-off-by: Maciej Kisielewski <email address hidden>

4511. By Maciej Kisielewski

converged: rename main py module to converged_app

Signed-off-by: Maciej Kisielewski <email address hidden>

4512. By Maciej Kisielewski

converged: rename touch to converged in qml bits

Signed-off-by: Maciej Kisielewski <email address hidden>

4513. By Maciej Kisielewski

converged: app rename to checkbox-converged

Signed-off-by: Maciej Kisielewski <email address hidden>

4514. By Maciej Kisielewski

converged: update readme

Signed-off-by: Maciej Kisielewski <email address hidden>

4515. By Maciej Kisielewski

converged: update About page

Signed-off-by: Maciej Kisielewski <email address hidden>

4516. By Maciej Kisielewski

converged: rename touch to converged in autopilot

Signed-off-by: Maciej Kisielewski <email address hidden>

4517. By Maciej Kisielewski

converged: rename touch to converged in container tests

Signed-off-by: Maciej Kisielewski <email address hidden>

4518. By Maciej Kisielewski

converged: update .{bzr,git}ignore (s/touch/converged/)

Signed-off-by: Maciej Kisielewski <email address hidden>

4519. By Maciej Kisielewski

converged: rename checkbox-touch dir to converged

Signed-off-by: Maciej Kisielewski <email address hidden>

4520. By Maciej Kisielewski

converged: update translations

Signed-off-by: Maciej Kisielewski <email address hidden>

4521. By Maciej Kisielewski

converged: rename last autopilot file

Signed-off-by: Maciej Kisielewski <email address hidden>

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

> Attempt to merge into lp:checkbox failed due to conflicts:
>
> text conflict in converged/build-me

Rebased on current trunk.

review: Needs Resubmitting

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