diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/bin2img/bin2img.go | 5 | ||||
| -rw-r--r-- | test/e2e/rootless_test.go | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/bin2img/bin2img.go b/test/bin2img/bin2img.go index 644832c77..ed493dcc1 100644 --- a/test/bin2img/bin2img.go +++ b/test/bin2img/bin2img.go @@ -9,6 +9,7 @@ import ( "os" "runtime" + "github.com/containers/image/pkg/blobinfocache" "github.com/containers/image/storage" "github.com/containers/image/types" sstorage "github.com/containers/storage" @@ -156,7 +157,7 @@ func main() { os.Exit(1) } defer img.Close() - layer, err := img.PutBlob(ctx, layerBuffer, layerInfo, false) + layer, err := img.PutBlob(ctx, layerBuffer, layerInfo, blobinfocache.NewMemoryCache(), false) if err != nil { logrus.Errorf("error preparing to write image: %v", err) os.Exit(1) @@ -184,7 +185,7 @@ func main() { Digest: digest.Canonical.FromBytes(cbytes), Size: int64(len(cbytes)), } - configInfo, err = img.PutBlob(ctx, bytes.NewBuffer(cbytes), configInfo, false) + configInfo, err = img.PutBlob(ctx, bytes.NewBuffer(cbytes), configInfo, blobinfocache.NewMemoryCache(), false) if err != nil { logrus.Errorf("error saving configuration: %v", err) os.Exit(1) diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go index b15e6731b..037af9688 100644 --- a/test/e2e/rootless_test.go +++ b/test/e2e/rootless_test.go @@ -187,6 +187,10 @@ var _ = Describe("Podman rootless", func() { cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) + cmd = rootlessTest.PodmanAsUser([]string{"restart", "-l", "-t", "0"}, 1000, 1000, env) + cmd.WaitWithDefaultTimeout() + Expect(cmd.ExitCode()).To(Equal(0)) + canUseExec := canExec() if canUseExec { |