tests: handle case when both .real and plain are present #3202

Merged
merged 2 commits into from Apr 18, 2017

Conversation

Projects
None yet
2 participants
Contributor

zyga commented Apr 18, 2017

The testbed setup copies the apparmor profile of snap-confine into the
repackaged core snap. The file may be named either
usr.lib.snapd.snap-confine or usr.lib.snapd.snap-confine.real. In some
circumstances both files may be present and the copy command choked on
this. This patch fixes it.

Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@canonical.com

zyga added some commits Apr 18, 2017

tests: handle case when both .real and plain are present
The testbed setup copies the apparmor profile of snap-confine into the
repackaged core snap. The file may be named either
usr.lib.snapd.snap-confine or usr.lib.snapd.snap-confine.real. In some
circumstances both files may be present and the copy command choked on
this. This patch fixes it.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
tests: copy the aa-profile to a single target
Thanks to ogra for the insight

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

ogra1 approved these changes Apr 18, 2017

looks fine

@zyga zyga merged commit 0362f14 into snapcore:master Apr 18, 2017

5 of 6 checks passed

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

@zyga zyga deleted the zyga:fixes/snap-confine-profile-during-testing branch Apr 18, 2017

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