opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check for mutually exclusive flags

Browse Source 
Error out if more than one mutually exclusive flags are passed
in to kpod ps

Signed-off-by: umohnani8 <umohnani@redhat.com>

Closes: #128
Approved by: rhatdan
This commit is contained in:
umohnani8
2017-12-13 11:23:01 -05:00
committed by Atomic Bot
parent 05f4dd9f41
commit d8f099bb5a
2 changed files with 122 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/kpod/ps.go
View File

@ -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":

129
test/kpod_ps.bats
View File

@ -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"
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 -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"
echo "$output"
[ "$status" -eq 0 ]
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 ]
}