wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/system: Remove workaround for carriage return without a terminal

Browse source 
Commit a22d7821cb ensured that a nested pseudo-terminal device is
only created for the process running inside the container, if the Toolbx
binary's standard input and output streams are connected to a terminal.

Therefore, 'echo ...' no longer ends with an unwanted extra carriage
return when terminal devices are absent - there's only a line feed for
the trailing newline.  Hence, there's no need to use the -n flag to skip
the trailing newline.

This reverts parts of commit 16b0c5d88f.

https://github.com/containers/toolbox/issues/157
This commit is contained in:
Debarshi Ray 2022-11-10 19:03:26 +01:00
parent 190a76ac0a
commit f779c798f0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/system/104-run.bats
View file

@ -40,7 +40,7 @@ teardown() {
@test "run: Run echo 'Hello World' inside of the default container" { @test "run: Run echo 'Hello World' inside of the default container" {
create_default_container create_default_container
run $TOOLBOX --verbose run echo -n "Hello World" run $TOOLBOX --verbose run echo "Hello World"
assert_success assert_success
assert_line --index $((${#lines[@]}-1)) "Hello World" assert_line --index $((${#lines[@]}-1)) "Hello World"
@ -52,7 +52,7 @@ teardown() {
start_container running start_container running
stop_container running stop_container running
run $TOOLBOX --verbose run --container running echo -n "Hello World" run $TOOLBOX --verbose run --container running echo "Hello World"
assert_success assert_success
assert_line --index $((${#lines[@]}-1)) "Hello World" assert_line --index $((${#lines[@]}-1)) "Hello World"