github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-05-11 06:05:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12779 from rophy/fix/strip-cr-from-tty-exec

Browse Source 
tests: strip \r from kubectl exec output for TTY containers
This commit is contained in:
Aurélien Bombo
2026-04-07 10:19:21 -05:00
committed by GitHub
parent 0fd4559f7e f7d9024249
commit 79fab93041
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/kubernetes/k8s-exec.bats
View File

@@ -69,11 +69,11 @@ EOF"
## Cases for target container
### First container
container_name=$(kubectl exec $pod_name -c $first_container_name -- $env_command | grep CONTAINER_NAME)
container_name=$(kubectl exec $pod_name -c $first_container_name -- $env_command | grep CONTAINER_NAME | tr -d '\r')
[ "$container_name" == "CONTAINER_NAME=$first_container_name" ]
### Second container
container_name=$(kubectl exec $pod_name -c $second_container_name -- $env_command | grep CONTAINER_NAME)
container_name=$(kubectl exec $pod_name -c $second_container_name -- $env_command | grep CONTAINER_NAME | tr -d '\r')
[ "$container_name" == "CONTAINER_NAME=$second_container_name" ]
}

5
tests/integration/kubernetes/k8s-pid-ns.bats
View File

@@ -35,15 +35,16 @@ setup() {
kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
# Check PID from first container
# Strip \r — containers with tty: true return \r\n line endings
first_pid_container=$(kubectl exec $pod_name -c $first_container_name \
-- $ps_command | grep "/pause")
-- $ps_command | grep "/pause" | tr -d '\r')
# Verify that is not empty
check_first_pid=$(echo $first_pid_container | wc -l)
[ "$check_first_pid" == "1" ]
# Check PID from second container
second_pid_container=$(kubectl exec $pod_name -c $second_container_name \
-- $ps_command | grep "/pause")
-- $ps_command | grep "/pause" | tr -d '\r')
# Verify that is not empty
check_second_pid=$(echo $second_pid_container | wc -l)
[ "$check_second_pid" == "1" ]