tests: fix failing tests (snap core version, syslog changes) #3327

Merged
merged 3 commits into from May 16, 2017

Conversation

Projects
None yet
3 participants
Member

chipaca commented May 16, 2017

This branch fixes tests/main/listing to match what the core snap version currently is. It also fixes tests/lib/snaps/log-observe-consumer as syslog might not be there #3327

zyga approved these changes May 16, 2017

LGTM

@@ -7,11 +7,14 @@ prepare: |
execute: |
echo "List prints core snap version"
+ # most core versions should be like "16-2", so [0-9]{2}-[0-9.]+
@zyga

zyga May 16, 2017

Contributor

I think this will be 16-2.24.1 (for example) rather than 16-2 which was a limitation of snapcraft and was never intentional.

@chipaca

chipaca May 16, 2017

Member

I'm going to need a timeframe on this :-)

Looks good, only a missing "x" it seem, thanks!

tests/main/listing/task.yaml
if [ "$SPREAD_BACKEND" = "linode" -o "$SPREAD_BACKEND" == "qemu" ] && [ "$SPREAD_SYSTEM" = "ubuntu-core-16-64" ]; then
echo "With customized images the ubuntu-core snap is sideloaded"
- expected="^core .* [0-9]{2}-[0-9.]+ +x[0-9]+ +- *$"
+ expected='^core .* [0-9]{2}-[0-9.]+(\+[0-9]+(\.git\.[0-9a-f]+)?)? +[0-9]+ +- *$'
@fgimenez

fgimenez May 16, 2017

Contributor

I think a 'x' is missing here for the revision (on the ubuntu-core system core is sideoaded https://github.com/snapcore/snapd/blob/master/tests/lib/prepare.sh#L265)

@chipaca

chipaca May 16, 2017

Member

you're absolutely correct. Fixing.

chipaca added some commits May 16, 2017

tests/lib/snaps/log-observe-consumer: log-observe tries to read syslo…
…g which might not be there (use journalctl instead)

@chipaca chipaca changed the title from tests/main/listing: tweak core version regexp to tests/main/listing: tweak core version regexp. May 16, 2017

@chipaca chipaca changed the title from tests/main/listing: tweak core version regexp. to tests/main/listing: tweak core version regexp. Also, tests/lib/snaps/log-observe-consumer: syslog might not be there May 16, 2017

@zyga zyga changed the title from tests/main/listing: tweak core version regexp. Also, tests/lib/snaps/log-observe-consumer: syslog might not be there to tests: fix failing tests (snap core version, syslog changes) May 16, 2017

@chipaca chipaca merged commit e2ae1e4 into snapcore:master May 16, 2017

1 of 7 checks passed

artful-amd64 autopkgtest running
Details
xenial-amd64 autopkgtest running
Details
xenial-i386 autopkgtest running
Details
xenial-ppc64el autopkgtest running
Details
yakkety-amd64 autopkgtest running
Details
zesty-amd64 autopkgtest running
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

LGTM (with journalctl change)

@chipaca chipaca deleted the chipaca:tweak-listing-core-regexp branch May 17, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment