Merge lp://qastaging/~elopio/snappy/integration-fix-rollback into lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Proposed by
Leo Arias
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~elopio/snappy/integration-fix-rollback |
| Merge into: | lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github |
| Prerequisite: | lp://qastaging/~elopio/snappy/assertion_messages |
| Diff against target: |
515 lines (+160/-122) (has conflicts) 4 files modified
_integration-tests/tests/rollback_test.go (+2/-1) _integration-tests/testutils/partition/bootloader.go (+26/-4) _integration-tests/testutils/partition/bootloader_test.go (+121/-106) _integration-tests/testutils/partition/partition_test.go (+11/-11) Text conflict in _integration-tests/tests/examples_test.go Text conflict in _integration-tests/testutils/wait/wait_test.go |
| To merge this branch: | bzr merge lp://qastaging/~elopio/snappy/integration-fix-rollback |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Snappy Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Fixed the integration fake rollback test. It was using the deprecated uboot config file.
To post a comment you must log in.
Revision history for this message
| Leo Arias (elopio) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This fixes the queries to the uboot, but doens't yet make the test pass in bbb.
I'm proposing this now as a clear bug fix, and I'll start to think what to do for the bbb. The problem is that it's being extra slow, so we have to increase the timeout. It would be nice to have a solution so the timeout is not hardcoded. And it would be even nicer if the bug that causes this to happen is fixed. Bug #1498293