Merge lp://staging/~toykeeper/ubuntu-power-tests/apt-update into lp://staging/ubuntu-power-tests

Proposed by Selene ToyKeeper
Status: Merged
Approved by: Selene ToyKeeper
Approved revision: 87
Merged at revision: 16
Proposed branch: lp://staging/~toykeeper/ubuntu-power-tests/apt-update
Merge into: lp://staging/ubuntu-power-tests
Prerequisite: lp://staging/~toykeeper/ubuntu-power-tests/music-video-lowpower-statistics
Diff against target: 350 lines (+160/-32)
12 files modified
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+13/-0)
debian/copyright (+22/-0)
debian/install (+1/-0)
debian/rules (+32/-0)
debian/source/format (+1/-0)
debian/tests/control (+3/-0)
debian/tests/placeholder (+2/-0)
flash/flash.sh (+14/-0)
power.py (+61/-30)
test-new-builds.sh (+5/-2)
To merge this branch: bzr merge lp://staging/~toykeeper/ubuntu-power-tests/apt-update
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Selene ToyKeeper (community) Needs Resubmitting
Max Brustkern (community) Approve
Review via email: mp+274950@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-10-19.

Commit message

Added --apt-update option, since recent tests completely fail without it.

Description of the change

Added --apt-update option, since recent tests completely fail without it.

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

Is there a reason this works better than passing in -U to the adt-run commands, or is this just less complicated than adding all that logic to pass the option through things? I know we like to avoid enabling rw when possible, but I can see how this could save time.

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

If we do it at test time, apt-update must run before every test. If we do it at flash time, it only needs to happen once. I find that it can double or triple the per-test time, and is less reliable when performed in a temp directory. It's long enough that we'd also have to extend the timeouts, or every test would fail.

I'm not sure why adt-run no longer works (at all) without an apt-update, but this is the most straightforward fix I've found. Long-term I'd prefer to eliminate its dependencies though, so it wouldn't need to install anything in order to function.

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

Makes sense to me. Removing dependencies long term is also a good goal.

review: Approve
85. By Selene ToyKeeper

Added a very very basic debian/ directory.
Hopefully this will satisfy jenkins.
The actual tests are under adt/debian/ , to avoid problems found
earlier with adt putting way too much junk on the device
(which would actually break the tests).

86. By Selene ToyKeeper

Disconnect device after tests finish.
For some reason, this actually results in *lower* power use
(and thus allows the power supply fan to stop between test runs).

87. By Selene ToyKeeper

Made wait_for_device() time out after a while, disconnect/reconnect USB,
and try again. This works around USB reliability issues I'm seeing in my
physical test setup.

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

Added a debian directory; hopefully it will serve at least minimal function.
Also added other recent changes that I had been delaying.

Waiting on results from Jenkins...

review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Selene ToyKeeper (toykeeper) wrote :

Awesome. Anything else we need before landing?

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

I think we should be good!

On Tue, Nov 10, 2015 at 2:42 AM, Selene Scriven <
<email address hidden>> wrote:

> Awesome. Anything else we need before landing?
> --
>
> https://code.launchpad.net/~toykeeper/ubuntu-power-tests/apt-update/+merge/274950
> You are reviewing the proposed merge of
> lp:~toykeeper/ubuntu-power-tests/apt-update into lp:ubuntu-power-tests.
>

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