Merge pull request containers#12367 from rst0git/file-locks-1

test: Update error string for --file-locks test
rhatdan · Nov 19, 2021 · 671e5ee · 671e5ee
2 parents f82f6c1 + b2623ce
commit 671e5ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
@@ -221,6 +221,7 @@ func Checkpoint(w http.ResponseWriter, r *http.Request) {
 		PrintStats     bool `schema:"printStats"`
 		PreCheckpoint  bool `schema:"preCheckpoint"`
 		WithPrevious   bool `schema:"withPrevious"`
+		FileLocks      bool `schema:"fileLocks"`
 	}{
 		// override any golang type defaults
 	}
@@ -246,6 +247,7 @@ func Checkpoint(w http.ResponseWriter, r *http.Request) {
 		PrintStats:     query.PrintStats,
 		PreCheckPoint:  query.PreCheckpoint,
 		WithPrevious:   query.WithPrevious,
+		FileLocks:      query.FileLocks,
 	}
 
 	if query.Export {
@@ -305,6 +307,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
 		IgnoreStaticIP  bool   `schema:"ignoreStaticIP"`
 		IgnoreStaticMAC bool   `schema:"ignoreStaticMAC"`
 		PrintStats      bool   `schema:"printStats"`
+		FileLocks       bool   `schema:"fileLocks"`
 		PublishPorts    string `schema:"publishPorts"`
 	}{
 		// override any golang type defaults
@@ -324,6 +327,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
 		IgnoreStaticIP:  query.IgnoreStaticIP,
 		IgnoreStaticMAC: query.IgnoreStaticMAC,
 		PrintStats:      query.PrintStats,
+		FileLocks:       query.FileLocks,
 		PublishPorts:    strings.Fields(query.PublishPorts),
 	}
 

diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
@@ -1355,7 +1355,7 @@ var _ = Describe("Podman checkpoint", func() {
 		result := podmanTest.Podman([]string{"container", "checkpoint", "test_name"})
 		result.WaitWithDefaultTimeout()
 		Expect(result).Should(Exit(125))
-		Expect(result.ErrorToString()).To(ContainSubstring("criu failed"))
+		Expect(result.ErrorToString()).To(ContainSubstring("failed: exit status 1"))
 		Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
 
 		// Checkpoint is expected to succeed with --file-locks