From 186a38ba732e23758e39c1eee0e47dabd56d7048 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 16 Sep 2020 16:15:01 -0700 Subject: [PATCH] tests/int: whitespace cleanup Fix - whitespace at EOL - empty lines at EOF Signed-off-by: Kir Kolyshkin --- tests/integration/checkpoint.bats | 1 - tests/integration/mask.bats | 2 +- tests/integration/mounts.bats | 4 ++-- tests/integration/start_detached.bats | 2 +- tests/integration/start_hello.bats | 4 ++-- tests/integration/umask.bats | 2 +- tests/integration/update.bats | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/integration/checkpoint.bats b/tests/integration/checkpoint.bats index 9698d6de4..5f0ea5589 100644 --- a/tests/integration/checkpoint.bats +++ b/tests/integration/checkpoint.bats @@ -318,4 +318,3 @@ function simple_cr() { unlink "$tmp" test -f ./work-dir/"$tmplog2" && unlink ./work-dir/"$tmplog2" } - diff --git a/tests/integration/mask.bats b/tests/integration/mask.bats index 827d17b32..d68252e28 100644 --- a/tests/integration/mask.bats +++ b/tests/integration/mask.bats @@ -11,7 +11,7 @@ function setup() { echo "Forbidden information!" > rootfs/testfile # add extra masked paths - update_config '(.. | select(.maskedPaths? != null)) .maskedPaths += ["/testdir", "/testfile"]' + update_config '(.. | select(.maskedPaths? != null)) .maskedPaths += ["/testdir", "/testfile"]' } function teardown() { diff --git a/tests/integration/mounts.bats b/tests/integration/mounts.bats index 1c7c001e7..1e1b8f0d1 100644 --- a/tests/integration/mounts.bats +++ b/tests/integration/mounts.bats @@ -13,8 +13,8 @@ function teardown() { } @test "runc run [bind mount]" { - update_config ' .mounts += [{"source": ".", "destination": "/tmp/bind", "options": ["bind"]}] - | .process.args |= ["ls", "/tmp/bind/config.json"]' + update_config ' .mounts += [{"source": ".", "destination": "/tmp/bind", "options": ["bind"]}] + | .process.args |= ["ls", "/tmp/bind/config.json"]' runc run test_bind_mount [ "$status" -eq 0 ] diff --git a/tests/integration/start_detached.bats b/tests/integration/start_detached.bats index b55239b2f..6682628a7 100644 --- a/tests/integration/start_detached.bats +++ b/tests/integration/start_detached.bats @@ -27,7 +27,7 @@ function teardown() { # replace "uid": 0 with "uid": 1000 # and do a similar thing for gid. update_config ' (.. | select(.uid? == 0)) .uid |= 1000 - | (.. | select(.gid? == 0)) .gid |= 100' + | (.. | select(.gid? == 0)) .gid |= 100' # run busybox detached runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox diff --git a/tests/integration/start_hello.bats b/tests/integration/start_hello.bats index e4200eb4b..dd2fad785 100644 --- a/tests/integration/start_hello.bats +++ b/tests/integration/start_hello.bats @@ -26,8 +26,8 @@ function teardown() { # replace "uid": 0 with "uid": 1000 # and do a similar thing for gid. - update_config ' (.. | select(.uid? == 0)) .uid |= 1000 - | (.. | select(.gid? == 0)) .gid |= 100' + update_config ' (.. | select(.uid? == 0)) .uid |= 1000 + | (.. | select(.gid? == 0)) .gid |= 100' # run hello-world runc run test_hello diff --git a/tests/integration/umask.bats b/tests/integration/umask.bats index b927da391..e8166cda2 100644 --- a/tests/integration/umask.bats +++ b/tests/integration/umask.bats @@ -12,7 +12,7 @@ function teardown() { } @test "umask" { - update_config '.process.user += {"umask":63}' + update_config '.process.user += {"umask":63}' # run busybox detached runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox diff --git a/tests/integration/update.bats b/tests/integration/update.bats index 8b08f80ac..1c44c0354 100644 --- a/tests/integration/update.bats +++ b/tests/integration/update.bats @@ -476,7 +476,7 @@ EOF # Run a basic shell script that tries to write to /dev/null. If "runc # update" makes use of minimal transition rules, updates should not cause # writes to fail at any point. - update_config '.process.args |= ["sh", "-c", "while true; do echo >/dev/null; done"]' + update_config '.process.args |= ["sh", "-c", "while true; do echo >/dev/null; done"]' # Set up a temporary console socket and recvtty so we can get the stdio. TMP_RECVTTY_DIR="$(mktemp -d "$BATS_TMPDIR/runc-tmp-recvtty.XXXXXX")"