Merge lp://qastaging/~mvo/snappy/lp1480248-test-reenable into lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github

Proposed by Michael Vogt
Status: Approved
Approved by: Leo Arias
Approved revision: 643
Proposed branch: lp://qastaging/~mvo/snappy/lp1480248-test-reenable
Merge into: lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 16 lines (+0/-7)
1 file modified
_integration-tests/tests/failover_zero_size_file_test.go (+0/-7)
To merge this branch: bzr merge lp://qastaging/~mvo/snappy/lp1480248-test-reenable
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Federico Gimenez (community) Needs Fixing
Review via email: mp+269176@code.qastaging.launchpad.net

Description of the change

Tiny branch that re-enables the zero-size initrd test. Kudos to Leo for remembering.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

This needs the bbb oem v1.12 to be released: https://code.launchpad.net/~mvo/snappy-hub/lp1480248-norootwait/+merge/269032

Also, in order to test it we need to fix the arm build in the tests: https://code.launchpad.net/~elopio/snappy/goarm_tests/+merge/269391

Revision history for this message
Leo Arias (elopio) wrote :

The test is failing with:

/home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go:248:
    ...open /home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go: no such file or directory
/home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go:143:
    ...open /home/elopio/workspace/go/src/launchpad.net/snappy/_integration-tests/tests/failover_zero_size_file_test.go: no such file or directory
... obtained int = 0
... expected int = 1
... 0 files matching /boot/uboot/a/snappy-selftest-initrd*, 1 expected

For some reason, it's looking for the backed up file in the a boot. /me digs more.

Revision history for this message
Leo Arias (elopio) wrote :

The tests needs this change to pass:

http://paste.ubuntu.com/12210111/

There's something weird in there, because the comments of the afterUpdate parameter in the helper function don't seem accurate. I'm making a note to ask Federico about this.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks a lot! This is addressed now.

642. By Michael Vogt

apply test fix from Leo, many thanks!

Revision history for this message
Federico Gimenez (fgimenez) wrote :

With this changes I get an error on kvm: [1]

It seems that the function that determines the kernel filename pattern is wrong for uboot based systems, this patch [2] makes it work for me on both grub and uboot, could you please confirm?

Thanks!

[1] http://paste.ubuntu.com/12251925/
[2] http://paste.ubuntu.com/12251894/

Revision history for this message
Federico Gimenez (fgimenez) wrote :

The test should be reenabled now. However because of the latest changes the diff no longer applies, this one works [1]

Thanks,

[1] http://paste.ubuntu.com/12540267/

review: Needs Fixing
643. By Michael Vogt

merged lp:snappy

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks Federico! And sorry for the slow reply. This should be ready again.

Revision history for this message
Leo Arias (elopio) wrote :

Test passes. Thank you!

review: Approve

Unmerged revisions

643. By Michael Vogt

merged lp:snappy

642. By Michael Vogt

apply test fix from Leo, many thanks!

641. By Michael Vogt

re-enable TestZeroSizeInitrd on uboot now that lp1480248 is fixed

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