diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-20 10:40:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 10:40:03 -0800 |
| commit | fa998f224fb7aa15d85b09dfdc4491dc09c9e390 (patch) | |
| tree | e7dbbe1a7078e7586306881b8d7956afca2a4153 | |
| parent | 65c5883f5c887c567bf0db30af1e178ac052261c (diff) | |
| parent | 1f3726f2cf9ee4fcdb6c78dd2858e6c6bf135b05 (diff) | |
| download | podman-fa998f224fb7aa15d85b09dfdc4491dc09c9e390.tar.gz podman-fa998f224fb7aa15d85b09dfdc4491dc09c9e390.tar.bz2 podman-fa998f224fb7aa15d85b09dfdc4491dc09c9e390.zip | |
Merge pull request #2037 from baude/blkioskip
skip test for blkio.weight when kernel does not support it
| -rw-r--r-- | cmd/podman/rmi.go | 24 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 3 |
2 files changed, 15 insertions, 12 deletions
diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go index 910c7ba35..5e8ac81a2 100644 --- a/cmd/podman/rmi.go +++ b/cmd/podman/rmi.go @@ -24,22 +24,22 @@ var ( }, } rmiCommand = cli.Command{ - Name: "rmi", - Usage: "Removes one or more images from local storage", - Description: rmiDescription, - Action: rmiCmd, - ArgsUsage: "IMAGE-NAME-OR-ID [...]", - Flags: sortFlags(rmiFlags), + Name: "rmi", + Usage: "Removes one or more images from local storage", + Description: rmiDescription, + Action: rmiCmd, + ArgsUsage: "IMAGE-NAME-OR-ID [...]", + Flags: sortFlags(rmiFlags), UseShortOptionHandling: true, OnUsageError: usageErrorHandler, } rmImageCommand = cli.Command{ - Name: "rm", - Usage: "removes one or more images from local storage", - Description: rmiDescription, - Action: rmiCmd, - ArgsUsage: "IMAGE-NAME-OR-ID [...]", - Flags: rmiFlags, + Name: "rm", + Usage: "removes one or more images from local storage", + Description: rmiDescription, + Action: rmiCmd, + ArgsUsage: "IMAGE-NAME-OR-ID [...]", + Flags: rmiFlags, UseShortOptionHandling: true, OnUsageError: usageErrorHandler, } diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 2104991b2..d73d8662f 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -253,6 +253,9 @@ var _ = Describe("Podman run", func() { }) It("podman run blkio-weight test", func() { + if _, err := os.Stat("/sys/fs/cgroup/blkio/blkio.weight"); os.IsNotExist(err) { + Skip("Kernel does not support blkio.weight") + } session := podmanTest.Podman([]string{"run", "--rm", "--blkio-weight=15", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.weight"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |