opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
test: Update error string for --file-locks test
This commit is contained in:
OpenShift Merge Robot
2021-11-19 16:48:15 +01:00
committed by GitHub
parent f82f6c1b0d b2623ceb4b
commit 671e5ee42d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/handlers/libpod/containers.go
View File

@ -221,6 +221,7 @@ func Checkpoint(w http.ResponseWriter, r *http.Request) {
PrintStats bool `schema:"printStats"` PrintStats bool `schema:"printStats"`
PreCheckpoint bool `schema:"preCheckpoint"` PreCheckpoint bool `schema:"preCheckpoint"`
WithPrevious bool `schema:"withPrevious"` WithPrevious bool `schema:"withPrevious"`
FileLocks bool `schema:"fileLocks"`
}{ }{
// override any golang type defaults // override any golang type defaults
} }
@ -246,6 +247,7 @@ func Checkpoint(w http.ResponseWriter, r *http.Request) {
PrintStats: query.PrintStats, PrintStats: query.PrintStats,
PreCheckPoint: query.PreCheckpoint, PreCheckPoint: query.PreCheckpoint,
WithPrevious: query.WithPrevious, WithPrevious: query.WithPrevious,
FileLocks: query.FileLocks,
} }
if query.Export { if query.Export {
@ -305,6 +307,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
IgnoreStaticIP bool `schema:"ignoreStaticIP"` IgnoreStaticIP bool `schema:"ignoreStaticIP"`
IgnoreStaticMAC bool `schema:"ignoreStaticMAC"` IgnoreStaticMAC bool `schema:"ignoreStaticMAC"`
PrintStats bool `schema:"printStats"` PrintStats bool `schema:"printStats"`
FileLocks bool `schema:"fileLocks"`
PublishPorts string `schema:"publishPorts"` PublishPorts string `schema:"publishPorts"`
}{ }{
// override any golang type defaults // override any golang type defaults
@ -324,6 +327,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
IgnoreStaticIP: query.IgnoreStaticIP, IgnoreStaticIP: query.IgnoreStaticIP,
IgnoreStaticMAC: query.IgnoreStaticMAC, IgnoreStaticMAC: query.IgnoreStaticMAC,
PrintStats: query.PrintStats, PrintStats: query.PrintStats,
FileLocks: query.FileLocks,
PublishPorts: strings.Fields(query.PublishPorts), PublishPorts: strings.Fields(query.PublishPorts),
} }

2
test/e2e/checkpoint_test.go
View File

@ -1355,7 +1355,7 @@ var _ = Describe("Podman checkpoint", func() {
result := podmanTest.Podman([]string{"container", "checkpoint", "test_name"}) result := podmanTest.Podman([]string{"container", "checkpoint", "test_name"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(125)) 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)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
// Checkpoint is expected to succeed with --file-locks // Checkpoint is expected to succeed with --file-locks