summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/kpod/ps.go31
-rw-r--r--test/kpod_ps.bats129
2 files changed, 122 insertions, 38 deletions
diff --git a/cmd/kpod/ps.go b/cmd/kpod/ps.go
index 4148edf68..89fed991f 100644
--- a/cmd/kpod/ps.go
+++ b/cmd/kpod/ps.go
@@ -143,9 +143,8 @@ func psCmd(c *cli.Context) error {
return err
}
- // latest, and last are mutually exclusive.
- if c.Int("last") >= 0 && c.Bool("latest") {
- return errors.Errorf("last and latest are mutually exclusive")
+ if err := checkFlagsPassed(c); err != nil {
+ return errors.Wrapf(err, "error with flags passed")
}
runtime, err := getRuntime(c)
@@ -212,6 +211,32 @@ func psCmd(c *cli.Context) error {
return generatePsOutput(outputContainers, opts)
}
+// checkFlagsPassed checks if mutually exclusive flags are passed together
+func checkFlagsPassed(c *cli.Context) error {
+ // latest, and last are mutually exclusive.
+ if c.Int("last") >= 0 && c.Bool("latest") {
+ return errors.Errorf("last and latest are mutually exclusive")
+ }
+ // quiet, size, namespace, and format with Go template are mutually exclusive
+ flags := 0
+ if c.Bool("quiet") {
+ flags++
+ }
+ if c.Bool("size") {
+ flags++
+ }
+ if c.Bool("namespace") {
+ flags++
+ }
+ if c.IsSet("format") && c.String("format") != formats.JSONString {
+ flags++
+ }
+ if flags > 1 {
+ return errors.Errorf("quiet, size, namespace, and format with Go template are mutually exclusive")
+ }
+ return nil
+}
+
func generateContainerFilterFuncs(filter, filterValue string, runtime *libpod.Runtime) (func(container *libpod.Container) bool, error) {
switch filter {
case "id":
diff --git a/test/kpod_ps.bats b/test/kpod_ps.bats
index 3a5d94f59..977266f59 100644
--- a/test/kpod_ps.bats
+++ b/test/kpod_ps.bats
@@ -12,120 +12,179 @@ function teardown() {
}
@test "kpod ps with no containers" {
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps default" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps all flag" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps size flag" {
- skip "Need size flag implemented in container backend"
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --size
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --size"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps quiet flag" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --quiet
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ ctr_id="$output"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --quiet"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps latest flag" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps --latest
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps --latest"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps last flag" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${BB} ls
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls -s
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps --last 2
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${BB} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls -s"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps --last 2"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps no-trunc flag" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --no-trunc
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --no-trunc"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps namespace flag" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps --all --namespace
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps --all --namespace"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps namespace flag and format flag = json" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --ns --format json | python -m json.tool | grep namespace"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps without namespace flag and format flag = json" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --format json | python -m json.tool | grep namespace"
echo "$output"
[ "$status" -eq 1 ]
}
@test "kpod ps format flag = go template" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --format "table {{.ID}} {{.Image}} {{.Labels}}"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --format 'table {{.ID}} {{.Image}} {{.Labels}}'"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps filter flag - ancestor" {
- ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter ancestor=${ALPINE}
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter ancestor=${ALPINE}"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps filter flag - id" {
- run ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls
- ctr_id="$output"
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id="$ctr_id"
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} ls"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter id=$ctr_id"
echo "$output"
[ "$status" -eq 0 ]
}
@test "kpod ps filter flag - status" {
- run ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 99
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 99"
ctr_id="$output"
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter status=running
echo "$output"
[ "$status" -eq 0 ]
- run ${KPOD_BINARY} ${KPOD_OPTIONS} stop $ctr_id
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --filter status=running"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} stop $ctr_id"
+ echo "$output"
+ [ "$status" -eq 0 ]
}
@test "kpod ps short options" {
- run ${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 99
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 99"
+ ctr_id="$output"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -aq"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} stop $ctr_id"
+ echo "$output"
+ [ "$status" -eq 0 ]
+}
+
+@test "kpod ps with mutually exclusive flags" {
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d ${ALPINE} sleep 99"
ctr_id="$output"
- run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} ps -aqs
echo "$output"
[ "$status" -eq 0 ]
- run ${KPOD_BINARY} ${KPOD_OPTIONS} stop $ctr_id
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -aqs"
+ echo "$output"
+ [ "$status" -ne 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --ns -s"
+ echo "$output"
+ [ "$status" -ne 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --ns format {{.ID}}"
+ echo "$output"
+ [ "$status" -ne 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} ps -a --ns --format json"
+ echo "$output"
+ [ "$status" -eq 0 ]
+ run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} stop $ctr_id"
+ echo "$output"
+ [ "$status" -eq 0 ]
}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-05 19:33:23 +0000