From 0e1ac6217b2a0358ee16facb67ca77751b1f5753 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 23 Dec 2019 01:22:30 -0500 Subject: [PATCH] correct test expectations --- test/run-versions | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/run-versions b/test/run-versions index fcfaf94..ba24d87 100755 --- a/test/run-versions +++ b/test/run-versions @@ -18,7 +18,11 @@ testPython2() { echo $LATEST_27 > "runtime.txt" compile "python2" assertCaptured $LATEST_27 - assertCaptured "python-2-7-eol-faq" + if [[ $(date "+%Y") > "2019" ]]; then + assertCaptured "python-2-7-eol-faq"; + else + assertNotCaptured "python-2-7-eol-faq"; + fi assertNotCaptured "security update" assertCaptured "Installing SQLite3" assertCapturedSuccess @@ -27,7 +31,11 @@ testPython2() { testPython2_warn() { compile "python2_warn" assertCaptured "python-2.7.15" - assertCaptured "python-2-7-eol-faq" + if [[ $(date "+%Y") > "2019" ]]; then + assertCaptured "python-2-7-eol-faq"; + else + assertNotCaptured "python-2-7-eol-faq"; + fi assertCaptured "Only the latest version" assertCaptured "Installing SQLite3" assertCapturedSuccess @@ -170,14 +178,14 @@ testPython3_8_fail() { testPypy3_6() { compile "pypy3_6" - assertCaptured "Installing Pypy 3.6" + assertCaptured "Installing pypy" assertCaptured "$PYPY_36" assertCapturedSuccess } testPypy2_7() { compile "pypy2_7" - assertCaptured "Installing Pypy 2.7" + assertCaptured "Installing pypy" assertCaptured "$PYPY_27" assertCapturedSuccess }