From c6c8ff1988664c305c2d411bccf6bf6fb829fd6c Mon Sep 17 00:00:00 2001 From: Trevor Date: Thu, 23 Jun 2022 11:21:37 -0700 Subject: [PATCH] Redact some expected out (#375) --- bin/test_sites | 5 ++++- tests/downgrade.site/devices/DWN-1/expected/exceptions.txt | 1 - tests/downgrade.site/devices/DWN-2/expected/exceptions.txt | 1 - tests/downgrade.site/registration_summary.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/test_sites b/bin/test_sites index d6e904345d..c81511c306 100755 --- a/bin/test_sites +++ b/bin/test_sites @@ -30,7 +30,10 @@ subsets=$(cd $testdir; ls -d *.site) function redact_files { for file in $@; do - sed -E -i -e '/at .*\(.*\.java:[0-9]+\)/d' $file + sed -E -i \ + -e '/at .*\(.*\.java:[0-9]+\)/d' \ + -e '/\.\.\. [0-9]+ more/d' \ + $file done } diff --git a/tests/downgrade.site/devices/DWN-1/expected/exceptions.txt b/tests/downgrade.site/devices/DWN-1/expected/exceptions.txt index fd891e7000..9e79947cfa 100644 --- a/tests/downgrade.site/devices/DWN-1/expected/exceptions.txt +++ b/tests/downgrade.site/devices/DWN-1/expected/exceptions.txt @@ -1,6 +1,5 @@ Credential java.lang.RuntimeException: While loading credentials for local device DWN-1 Caused by: java.lang.RuntimeException: Found 0 credentials - ... 5 more Files com.google.daq.mqtt.util.ExceptionMap: devices/DWN-1 diff --git a/tests/downgrade.site/devices/DWN-2/expected/exceptions.txt b/tests/downgrade.site/devices/DWN-2/expected/exceptions.txt index cd3fbe2025..cf48137e33 100644 --- a/tests/downgrade.site/devices/DWN-2/expected/exceptions.txt +++ b/tests/downgrade.site/devices/DWN-2/expected/exceptions.txt @@ -1,6 +1,5 @@ Credential java.lang.RuntimeException: While loading credentials for local device DWN-2 Caused by: java.lang.RuntimeException: Found 0 credentials - ... 5 more Files com.google.daq.mqtt.util.ExceptionMap: devices/DWN-2 diff --git a/tests/downgrade.site/registration_summary.json b/tests/downgrade.site/registration_summary.json index ca51538f32..07fe360d0c 100644 --- a/tests/downgrade.site/registration_summary.json +++ b/tests/downgrade.site/registration_summary.json @@ -8,6 +8,6 @@ "DWN-2" : "devices/DWN-2" }, "Version" : { - "main" : "1.3.13-86-g888abb42" + "main" : "1.3.13-87-g8566aca1" } } \ No newline at end of file