From f1b0f8c15482a9c157e36666472f8004732f8282 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Thu, 24 Oct 2019 12:48:04 -0700 Subject: [PATCH] correct the pass/fail metric for python 34 --- test/fixtures/python3_4/runtime.txt | 2 +- test/run-versions | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/test/fixtures/python3_4/runtime.txt b/test/fixtures/python3_4/runtime.txt index cc8325f..3b5c63e 100644 --- a/test/fixtures/python3_4/runtime.txt +++ b/test/fixtures/python3_4/runtime.txt @@ -1 +1 @@ -python-3.4.9 +python-3.4.10 diff --git a/test/run-versions b/test/run-versions index 3459aa5..6a5f67a 100755 --- a/test/run-versions +++ b/test/run-versions @@ -38,14 +38,18 @@ testPython2_fail() { } testPython3_4() { - updateVersion "python3_4" $LATEST_34 compile "python3_4" assertCaptured $LATEST_34 assertNotCaptured "security update" - if [[ $STACK == "cedar-14" ]] || [[ $STACK == "heroku-16" ]]; then - assertCapturedSuccess + # if cedar 14 and legacy binaries, fail. if cedar 14 and staging, succeed. + if [[ ! -n $USE_STAGING_BINARIES ]] && [[ $STACK == "cedar-14" ]]; then + assertCapturedError +# if heroku 18 and legacy binaries, succeed. if heroku 18 and staging, fail. + elif [[ -n $USE_STAGING_BINARIES ]] && [[ $STACK == "heroku-18" ]]; then + assertCapturedError else - assertCapturedError +# all else succeed + assertCapturedSuccess fi } @@ -53,10 +57,15 @@ testPython3_4_warn() { compile "python3_4_warn" assertCaptured "python-3.4.9" assertCaptured "security update!" - if [[ $STACK == "cedar-14" ]] || [[ $STACK == "heroku-16" ]]; then - assertCapturedSuccess + # if cedar 14 and legacy binaries, fail. if cedar 14 and staging, succeed. + if [[ ! -n $USE_STAGING_BINARIES ]] && [[ $STACK == "cedar-14" ]]; then + assertCapturedError +# if heroku 18 and legacy binaries, succeed. if heroku 18 and staging, fail. + elif [[ -n $USE_STAGING_BINARIES ]] && [[ $STACK == "heroku-18" ]]; then + assertCapturedError else - assertCapturedError +# all else succeed + assertCapturedSuccess fi }