9 files changed, 68 insertions, 22 deletions
diff --git a/test/compose/ipam_set_ip/docker-compose.yml b/test/compose/ipam_set_ip/docker-compose.yml
new file mode 100644
index 000000000..d220c02c0
--- /dev/null
+++ b/test/compose/ipam_set_ip/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3.2"
+services:
+  test:
+    image: alpine
+    networks:
+      net1:
+        ipv4_address: 10.123.0.253
+    tty: true
+    command: ["top"]
+
+networks:
+  net1:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 10.123.0.0/24
diff --git a/test/compose/ipam_set_ip/tests.sh b/test/compose/ipam_set_ip/tests.sh
new file mode 100644
index 000000000..ecaf3167e
--- /dev/null
+++ b/test/compose/ipam_set_ip/tests.sh
@@ -0,0 +1,4 @@
+# -*- bash -*-
+
+podman container inspect ipam_set_ip_test_1 --format '{{ .NetworkSettings.Networks.ipam_set_ip_net1.IPAddress }}'
+like "$output" "10.123.0.253" "$testname : ip address is set"
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 8530d3dd3..359345096 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -605,13 +605,6 @@ func SkipIfRootlessCgroupsV1(reason string) {
 	}
 }
 
-func SkipIfUnprivilegedCPULimits() {
-	info := GetHostDistributionInfo()
-	if isRootless() && info.Distribution == "fedora" {
-		ginkgo.Skip("Rootless Fedora doesn't have permission to set CPU limits")
-	}
-}
-
 func SkipIfRootless(reason string) {
 	checkReason(reason)
 	if os.Geteuid() != 0 {
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 836fbe1ee..dc3913394 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -1999,8 +1999,7 @@ VOLUME %s`, ALPINE, hostPathDir+"/")
 
 	It("podman play kube allows setting resource limits", func() {
 		SkipIfContainerized("Resource limits require a running systemd")
-		SkipIfRootlessCgroupsV1("Limits require root or cgroups v2")
-		SkipIfUnprivilegedCPULimits()
+		SkipIfRootless("CPU limits require root")
 		podmanTest.CgroupManager = "systemd"
 
 		var (
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index d5269f415..2d7d84005 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -270,7 +270,7 @@ var _ = Describe("Podman ps", func() {
 		Expect(result.ExitCode()).To(Equal(0))
 		Expect(result.OutputToString()).To(Equal(cid))
 
-		// Query by trunctated image name should not match ( should return empty output )
+		// Query by truncated image name should not match ( should return empty output )
 		result = podmanTest.Podman([]string{"ps", "-q", "--no-trunc", "-a", "--filter", "ancestor=quay.io/libpod/alpi"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(0))
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 35107f0a0..5d44c373f 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -10,16 +10,18 @@ function setup() {
     :
 }
 
-@test "podman --context emits reasonable output" {
-    run_podman 125 --context=swarm version
-    is "$output" "Error: Podman does not support swarm, the only --context value allowed is \"default\"" "--context=default or fail"
-
-    run_podman --context=default version
-}
+#### DO NOT ADD ANY TESTS HERE! ADD NEW TESTS AT BOTTOM!
 
 @test "podman version emits reasonable output" {
     run_podman version
 
+    # FIXME FIXME FIXME: #10248: nasty message on Ubuntu cgroups v1, rootless
+    if [[ "$output" =~ "overlay test mount with multiple lowers failed" ]]; then
+        if is_rootless; then
+            lines=("${lines[@]:1}")
+        fi
+    fi
+
     # First line of podman-remote is "Client:<blank>".
     # Just delete it (i.e. remove the first entry from the 'lines' array)
     if is_remote; then
@@ -41,6 +43,17 @@ function setup() {
 }
 
 
+@test "podman --context emits reasonable output" {
+    # All we care about here is that the command passes
+    run_podman --context=default version
+
+    # This one must fail
+    run_podman 125 --context=swarm version
+    is "$output" \
+       "Error: Podman does not support swarm, the only --context value allowed is \"default\"" \
+       "--context=default or fail"
+}
+
 @test "podman can pull an image" {
     run_podman pull $IMAGE
 }
diff --git a/test/system/045-start.bats b/test/system/045-start.bats
index ff818e51d..542f9d1c2 100644
--- a/test/system/045-start.bats
+++ b/test/system/045-start.bats
@@ -40,4 +40,21 @@ load helpers
     fi
 }
 
+@test "podman start --filter - start only containers that match the filter" {
+    run_podman run -d $IMAGE /bin/true
+    cid="$output"
+    run_podman start --filter restart-policy=always $cid "CID of restart-policy=always container"
+    is "$output" ""
+
+    run_podman start --filter restart-policy=none $cid "CID of restart-policy=none container"
+    is "$output" "$cid"
+}
+
+@test "podman start --filter invalid-restart-policy - return error" {
+    run_podman run -d $IMAGE /bin/true
+    cid="$output"
+    run_podman 125 start --filter restart-policy=fakepolicy $cid "CID of restart-policy=<not-exists> container"
+    is "$output" "Error: fakepolicy invalid restart policy"
+}
+
 # vim: filetype=sh
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats
index 95233c1e6..f8cee0e59 100644
--- a/test/system/410-selinux.bats
+++ b/test/system/410-selinux.bats
@@ -198,20 +198,23 @@ function check_label() {
     skip_if_no_selinux
 
     LABEL="system_u:object_r:tmp_t:s0"
+    RELABEL="system_u:object_r:container_file_t:s0"
     tmpdir=$PODMAN_TMPDIR/vol
     touch $tmpdir
     chcon -vR ${LABEL} $tmpdir
     ls -Z $tmpdir
 
     run_podman run -v $tmpdir:/test $IMAGE cat /proc/self/attr/current
-    level=$(secon -l $output)
     run ls -dZ ${tmpdir}
     is "$output" ${LABEL} "No Relabel Correctly"
 
-    run_podman run -v $tmpdir:/test:Z --security-opt label=disable $IMAGE cat /proc/self/attr/current
-    level=$(secon -l $output)
+    run_podman run -v $tmpdir:/test:z --security-opt label=disable $IMAGE cat /proc/self/attr/current
+    run ls -dZ $tmpdir
+    is "$output" ${RELABEL} "Privileged Relabel Correctly"
+
+    run_podman run -v $tmpdir:/test:z --privileged $IMAGE cat /proc/self/attr/current
     run ls -dZ $tmpdir
-    is "$output" ${LABEL} "No Privileged Relabel Correctly"
+    is "$output" ${RELABEL} "Privileged Relabel Correctly"
 
     run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current
     level=$(secon -l $output)
@@ -220,7 +223,7 @@ function check_label() {
 
     run_podman run -v $tmpdir:/test:z $IMAGE cat /proc/self/attr/current
     run ls -dZ $tmpdir
-    is "$output" "system_u:object_r:container_file_t:s0" "Shared Relabel Correctly"
+    is "$output" ${RELABEL} "Shared Relabel Correctly"
 }
 
 # vim: filetype=sh
diff --git a/test/upgrade/README.md b/test/upgrade/README.md
index 2979a66d7..6e5005134 100644
--- a/test/upgrade/README.md
+++ b/test/upgrade/README.md
@@ -84,4 +84,4 @@ Where To Go From Here
 
 * Figuring out how/if to run variations with different config files
   (e.g. running OLD-PODMAN that creates a user libpod.conf, tweaking
-  that in the test, then running NEW-PODMAN upgrate tests)
+  that in the test, then running NEW-PODMAN upgrade tests)