Merge pull request #619 from jnovy/tests-fix

Fix remaining busybox references in tests

Author: jnovy

test/02-ctr-logs.bats

@@ -124,13 +124,13 @@ run_conmon_with_log_opts() {
         --log-label "CONMON_TEST_LABEL2=$CTR_ID"
 
     run journalctl --user CONMON_TEST_LABEL1="$CTR_ID"
-    assert "${output}" =~ "hello from busybox"
+    assert "${output}" =~ "hello from ubi10"
 
     run journalctl --user CONMON_TEST_LABEL2="$CTR_ID"
-    assert "${output}" =~ "hello from busybox"
+    assert "${output}" =~ "hello from ubi10"
 
     run journalctl --user NON_EXISTING_LABEL="$CTR_ID"
-    assert "${output}" !~ "hello from busybox"
+    assert "${output}" !~ "hello from ubi10"
 }
 
 @test "ctr logs: k8s-file with --log-tag" {
@@ -147,13 +147,13 @@ run_conmon_with_log_opts() {
         --log-tag "tag_$CTR_ID"
 
     run journalctl --user CONTAINER_TAG="tag_$CTR_ID"
-    assert "${output}" =~ "hello from busybox"
+    assert "${output}" =~ "hello from ubi10"
 }
 
 @test "ctr logs: journald partial message" {
     # Print a message longer than the conmon buffer.
     # It should split it into multiple partial messages.
-    setup_container_env "printf '%*s' "65535" | /busybox tr ' ' '#'"
+    setup_container_env "printf '%*s' "65535" | tr ' ' '#'"
     run_conmon_with_default_args \
         --log-path "journald:"
 
@@ -164,7 +164,7 @@ run_conmon_with_log_opts() {
 @test "ctr logs: k8s partial message" {
     # Print a message longer than the conmon buffer.
     # It should split it into multiple partial messages.
-    setup_container_env "printf '%*s' "65535" | /busybox tr ' ' '#'"
+    setup_container_env "printf '%*s' "65535" | tr ' ' '#'"
     run_conmon_with_default_args \
         --log-path "k8s-file:$LOG_PATH"
 

test/10-ctrl.bats

@@ -159,7 +159,7 @@ test_resize_command_ok() {
 }
 
 @test "ctrl: rotate logs with --log-rotate" {
-    setup_container_env "/busybox echo 'before rotation'; while [ ! -f /tmp/test.txt ]; do /busybox sleep 0.1; done; /busybox echo 'after rotation'" "true"
+    setup_container_env "echo 'before rotation'; while [ ! -f /tmp/test.txt ]; do sleep 0.1; done; echo 'after rotation'" "true"
     generate_process_spec "echo 'Hello from exec!' && echo 'Hello there!' > /tmp/test.txt"
     start_conmon_with_default_args \
         --log-path "k8s-file:$LOG_PATH" \