diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-05-18 10:05:03 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-05-20 14:47:51 -0400 |
| commit | 32dd933a7e312215c55bf05628be34b3ce9fbdf5 (patch) | |
| tree | 216cfa1539cd7a71a96cdb00f5be4c64ba14b56e /test/e2e | |
| parent | 0649552f2bcb101c7c85677449591534e043ff8d (diff) | |
| download | podman-32dd933a7e312215c55bf05628be34b3ce9fbdf5.tar.gz podman-32dd933a7e312215c55bf05628be34b3ce9fbdf5.tar.bz2 podman-32dd933a7e312215c55bf05628be34b3ce9fbdf5.zip | |
update c/common
Update containers common to the latest HEAD. Some bug fixes in libimage
forced us to have a clearer separation between ordinary images and
manifest lists. Hence, when looking up manifest lists without recursing
into any of their instances, we need to use `LookupManifestList()`.
Also account for some other changes in c/common (e.g., the changed order
in the security labels).
Further vendor the latest HEAD from Buildah which is required to get the
bud tests to pass.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
<MH: Stripped out vendor bits - just left remaining changes>
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/run_security_labels_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index b714df323..ae86bb690 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -45,7 +45,7 @@ var _ = Describe("Podman generate kube", func() { ctr := inspect.InspectContainerToJSON() caps := strings.Join(ctr[0].EffectiveCaps, ",") - Expect(caps).To(Equal("CAP_SETUID,CAP_SETGID")) + Expect(caps).To(Equal("CAP_SETGID,CAP_SETUID")) }) It("podman bad security labels", func() { @@ -109,7 +109,7 @@ var _ = Describe("Podman generate kube", func() { ctr := inspect.InspectContainerToJSON() caps := strings.Join(ctr[0].EffectiveCaps, ",") - Expect(caps).To(Equal("CAP_SYS_CHROOT,CAP_SETUID")) + Expect(caps).To(Equal("CAP_SETUID,CAP_SYS_CHROOT")) }) |