From 25ef852ad60f9d09b6f23eef1cb3c4bce12d5b28 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 7 Feb 2022 16:15:52 -0800
Subject: [PATCH] tests/int: use = in test for strings comparison

Strictly speaking, == is for [[ only, not for [ / test,
and, unlike =, the right side is a pattern.

To avoid confusion, use =. In cases where we compare with empty string,
use -z instead.

Keep using [[ in some cases since it does not require quoting the left
and right side of comparison (I trust shellcheck on that one).

This should have no effect (other than the code being a tad more
strict).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 tests/integration/cgroups.bats    | 8 ++++----
 tests/integration/checkpoint.bats | 2 +-
 tests/integration/create.bats     | 4 ++--
 tests/integration/exec.bats       | 5 ++---
 tests/integration/helpers.bash    | 8 ++++----
 tests/integration/list.bats       | 6 +++---
 tests/integration/mask.bats       | 4 ++--
 tests/rootless.sh                 | 4 ++--
 8 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/tests/integration/cgroups.bats b/tests/integration/cgroups.bats
index 89c63f398..914ec499d 100644
--- a/tests/integration/cgroups.bats
+++ b/tests/integration/cgroups.bats
@@ -87,7 +87,7 @@ function setup() {
 
 	runc exec test_cgroups_group cat /proc/self/cgroup
 	[ "$status" -eq 0 ]
-	[[ ${lines[0]} == "0::/" ]]
+	[[ ${lines[0]} = "0::/" ]]
 
 	runc exec test_cgroups_group mkdir /sys/fs/cgroup/foo
 	[ "$status" -eq 0 ]
@@ -99,7 +99,7 @@ function setup() {
 	# because we haven't enabled any domain controller.
 	runc exec test_cgroups_group cat /proc/self/cgroup
 	[ "$status" -eq 0 ]
-	[[ ${lines[0]} == "0::/" ]]
+	[[ ${lines[0]} = "0::/" ]]
 
 	# turn on a domain controller (memory)
 	runc exec test_cgroups_group sh -euxc 'echo $$ > /sys/fs/cgroup/foo/cgroup.procs; echo +memory > /sys/fs/cgroup/cgroup.subtree_control'
@@ -109,7 +109,7 @@ function setup() {
 	# falls back to "/foo".
 	runc exec test_cgroups_group cat /proc/self/cgroup
 	[ "$status" -eq 0 ]
-	[[ ${lines[0]} == "0::/foo" ]]
+	[[ ${lines[0]} = "0::/foo" ]]
 
 	# teardown: remove "/foo"
 	# shellcheck disable=SC2016
@@ -301,7 +301,7 @@ function setup() {
 	[[ $exec_cgroup == *"runc-cgroups-integration-test"* ]]
 
 	# check that the cgroups v2 path is the same for both processes
-	[[ "$run_cgroup" == "$exec_cgroup" ]]
+	[ "$run_cgroup" = "$exec_cgroup" ]
 }
 
 @test "runc exec should refuse a paused container" {
diff --git a/tests/integration/checkpoint.bats b/tests/integration/checkpoint.bats
index 98b112dc6..615ef8cb6 100644
--- a/tests/integration/checkpoint.bats
+++ b/tests/integration/checkpoint.bats
@@ -98,7 +98,7 @@ function runc_restore_with_pipes() {
 
 	runc exec --cwd /bin "$name" echo ok
 	[ "$status" -eq 0 ]
-	[[ ${output} == "ok" ]]
+	[ "$output" = "ok" ]
 }
 
 function simple_cr() {
diff --git a/tests/integration/create.bats b/tests/integration/create.bats
index afa9f9dfb..938ac8b63 100644
--- a/tests/integration/create.bats
+++ b/tests/integration/create.bats
@@ -50,7 +50,7 @@ function teardown() {
 	# check pid.txt was generated
 	[ -e pid.txt ]
 
-	[[ $(cat pid.txt) == $(__runc state test_busybox | jq '.pid') ]]
+	[[ $(cat pid.txt) = $(__runc state test_busybox | jq '.pid') ]]
 
 	# start the command
 	runc start test_busybox
@@ -73,7 +73,7 @@ function teardown() {
 	# check pid.txt was generated
 	[ -e pid.txt ]
 
-	[[ $(cat pid.txt) == $(__runc state test_busybox | jq '.pid') ]]
+	[[ $(cat pid.txt) = $(__runc state test_busybox | jq '.pid') ]]
 
 	# start the command
 	runc start test_busybox
diff --git a/tests/integration/exec.bats b/tests/integration/exec.bats
index 140cd1810..16a972cfa 100644
--- a/tests/integration/exec.bats
+++ b/tests/integration/exec.bats
@@ -140,8 +140,7 @@ function teardown() {
 
 	runc exec --user 1000:1000 --additional-gids 100 --additional-gids 65534 test_busybox id -G
 	[ "$status" -eq 0 ]
-
-	[[ ${output} == "1000 100 65534" ]]
+	[ "$output" = "1000 100 65534" ]
 }
 
 @test "runc exec --preserve-fds" {
@@ -154,7 +153,7 @@ function teardown() {
 	exec 4<preserve-fds.test
 	runc exec --preserve-fds=2 test_busybox cat /proc/self/fd/4
 	[ "$status" -eq 0 ]
-	[[ "${output}" == "hello" ]]
+	[ "${output}" = "hello" ]
 }
 
 function check_exec_debug() {
diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash
index 90f92bdd7..2bd743c65 100644
--- a/tests/integration/helpers.bash
+++ b/tests/integration/helpers.bash
@@ -152,7 +152,7 @@ function create_parent() {
 		"$SD_HELPER" --parent machine.slice start "$SD_PARENT_NAME"
 	else
 		[ ! -v REL_PARENT_PATH ] && return
-		if [ "$CGROUP_UNIFIED" == "yes" ]; then
+		if [ "$CGROUP_UNIFIED" = "yes" ]; then
 			mkdir "/sys/fs/cgroup$REL_PARENT_PATH"
 		else
 			local subsys
@@ -172,7 +172,7 @@ function remove_parent() {
 		"$SD_HELPER" --parent machine.slice stop "$SD_PARENT_NAME"
 	else
 		[ ! -v REL_PARENT_PATH ] && return
-		if [ "$CGROUP_UNIFIED" == "yes" ]; then
+		if [ "$CGROUP_UNIFIED" = "yes" ]; then
 			rmdir "/sys/fs/cgroup/$REL_PARENT_PATH"
 		else
 			local subsys
@@ -229,7 +229,7 @@ function set_cgroups_path() {
 	fi
 
 	# Absolute path to container's cgroup v2.
-	if [ "$CGROUP_UNIFIED" == "yes" ]; then
+	if [ "$CGROUP_UNIFIED" = "yes" ]; then
 		CGROUP_PATH=${CGROUP_BASE_PATH}${REL_CGROUPS_PATH}
 	fi
 
@@ -498,7 +498,7 @@ function wait_for_container() {
 function testcontainer() {
 	# test state of container
 	runc state "$1"
-	if [ "$2" == "checkpointed" ]; then
+	if [ "$2" = "checkpointed" ]; then
 		[ "$status" -eq 1 ]
 		return
 	fi
diff --git a/tests/integration/list.bats b/tests/integration/list.bats
index a22dd19a4..b8821bc70 100644
--- a/tests/integration/list.bats
+++ b/tests/integration/list.bats
@@ -35,9 +35,9 @@ function teardown() {
 
 	ROOT=$ALT_ROOT runc list -q
 	[ "$status" -eq 0 ]
-	[[ "${lines[0]}" == "test_box1" ]]
-	[[ "${lines[1]}" == "test_box2" ]]
-	[[ "${lines[2]}" == "test_box3" ]]
+	[ "${lines[0]}" = "test_box1" ]
+	[ "${lines[1]}" = "test_box2" ]
+	[ "${lines[2]}" = "test_box3" ]
 
 	ROOT=$ALT_ROOT runc list --format table
 	[ "$status" -eq 0 ]
diff --git a/tests/integration/mask.bats b/tests/integration/mask.bats
index b5f296756..4bf834ef9 100644
--- a/tests/integration/mask.bats
+++ b/tests/integration/mask.bats
@@ -24,7 +24,7 @@ function teardown() {
 
 	runc exec test_busybox cat /testfile
 	[ "$status" -eq 0 ]
-	[[ "${output}" == "" ]]
+	[ -z "$output" ]
 
 	runc exec test_busybox rm -f /testfile
 	[ "$status" -eq 1 ]
@@ -42,7 +42,7 @@ function teardown() {
 
 	runc exec test_busybox ls /testdir
 	[ "$status" -eq 0 ]
-	[[ "${output}" == "" ]]
+	[ -z "$output" ]
 
 	runc exec test_busybox touch /testdir/foo
 	[ "$status" -eq 1 ]
diff --git a/tests/rootless.sh b/tests/rootless.sh
index f6872fad0..83be248a1 100755
--- a/tests/rootless.sh
+++ b/tests/rootless.sh
@@ -112,9 +112,9 @@ function enable_cgroup() {
 		# for runc to set up the hierarchy. XXX: This really shouldn't be
 		# necessary, and might actually be a bug in our impl of cgroup
 		# handling.
-		[[ "$cg" == "cpuset" ]] && chown rootless:rootless "$CGROUP_MOUNT/$cg$CGROUP_PATH/cpuset."{cpus,mems}
+		[ "$cg" = "cpuset" ] && chown rootless:rootless "$CGROUP_MOUNT/$cg$CGROUP_PATH/cpuset."{cpus,mems}
 		# The following is required by "update rt period and runtime".
-		if [[ "$cg" == "cpu" ]]; then
+		if [ "$cg" = "cpu" ]; then
 			if [[ -e "$CGROUP_MOUNT/$cg$CGROUP_PATH/cpu.rt_period_us" ]]; then
 				chown rootless:rootless "$CGROUP_MOUNT/$cg$CGROUP_PATH/cpu.rt_period_us"
 			fi