From f2165aaac688b5f8704bf54d576916d9bfc9a905 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Tue, 13 Nov 2018 16:11:14 -0600
Subject: [PATCH] update test fixtures for new python runtimes
---
test/fixtures/python2_fail/requirements.txt | 1 +
test/fixtures/python2_fail/runtime.txt | 1 +
.../requirements.txt | 0
test/fixtures/python3_4_fail/runtime.txt | 1 +
.../requirements.txt | 0
test/fixtures/python3_5_fail/runtime.txt | 1 +
test/fixtures/python3_6/runtime.txt | 2 +-
test/fixtures/python3_6_7/runtime.txt | 1 -
test/fixtures/python3_6_fail/requirements.txt | 1 +
test/fixtures/python3_6_fail/runtime.txt | 1 +
test/fixtures/python3_7/runtime.txt | 2 +-
test/fixtures/python3_7_1/runtime.txt | 1 -
test/fixtures/python3_7_fail/requirements.txt | 1 +
test/fixtures/python3_7_fail/runtime.txt | 1 +
test/fixtures/python3_7_warn/requirements.txt | 1 +
test/fixtures/python3_7_warn/runtime.txt | 1 +
test/fixtures/pythonDefault/requirements.txt | 1 +
test/run | 91 ++++++++++++-------
18 files changed, 73 insertions(+), 35 deletions(-)
create mode 100644 test/fixtures/python2_fail/requirements.txt
create mode 100644 test/fixtures/python2_fail/runtime.txt
rename test/fixtures/{python3_6_7 => python3_4_fail}/requirements.txt (100%)
create mode 100644 test/fixtures/python3_4_fail/runtime.txt
rename test/fixtures/{python3_7_1 => python3_5_fail}/requirements.txt (100%)
create mode 100644 test/fixtures/python3_5_fail/runtime.txt
delete mode 100644 test/fixtures/python3_6_7/runtime.txt
create mode 100644 test/fixtures/python3_6_fail/requirements.txt
create mode 100644 test/fixtures/python3_6_fail/runtime.txt
delete mode 100644 test/fixtures/python3_7_1/runtime.txt
create mode 100644 test/fixtures/python3_7_fail/requirements.txt
create mode 100644 test/fixtures/python3_7_fail/runtime.txt
create mode 100644 test/fixtures/python3_7_warn/requirements.txt
create mode 100644 test/fixtures/python3_7_warn/runtime.txt
create mode 100644 test/fixtures/pythonDefault/requirements.txt
diff --git a/test/fixtures/python2_fail/requirements.txt b/test/fixtures/python2_fail/requirements.txt
new file mode 100644
index 00000000..663bd1f6
--- /dev/null
+++ b/test/fixtures/python2_fail/requirements.txt
@@ -0,0 +1 @@
+requests
\ No newline at end of file
diff --git a/test/fixtures/python2_fail/runtime.txt b/test/fixtures/python2_fail/runtime.txt
new file mode 100644
index 00000000..d42956de
--- /dev/null
+++ b/test/fixtures/python2_fail/runtime.txt
@@ -0,0 +1 @@
+python-2.7.16
diff --git a/test/fixtures/python3_6_7/requirements.txt b/test/fixtures/python3_4_fail/requirements.txt
similarity index 100%
rename from test/fixtures/python3_6_7/requirements.txt
rename to test/fixtures/python3_4_fail/requirements.txt
diff --git a/test/fixtures/python3_4_fail/runtime.txt b/test/fixtures/python3_4_fail/runtime.txt
new file mode 100644
index 00000000..3b5c63e5
--- /dev/null
+++ b/test/fixtures/python3_4_fail/runtime.txt
@@ -0,0 +1 @@
+python-3.4.10
diff --git a/test/fixtures/python3_7_1/requirements.txt b/test/fixtures/python3_5_fail/requirements.txt
similarity index 100%
rename from test/fixtures/python3_7_1/requirements.txt
rename to test/fixtures/python3_5_fail/requirements.txt
diff --git a/test/fixtures/python3_5_fail/runtime.txt b/test/fixtures/python3_5_fail/runtime.txt
new file mode 100644
index 00000000..df4118a6
--- /dev/null
+++ b/test/fixtures/python3_5_fail/runtime.txt
@@ -0,0 +1 @@
+python-3.5.7
diff --git a/test/fixtures/python3_6/runtime.txt b/test/fixtures/python3_6/runtime.txt
index 1935e977..34b35b71 100644
--- a/test/fixtures/python3_6/runtime.txt
+++ b/test/fixtures/python3_6/runtime.txt
@@ -1 +1 @@
-python-3.6.6
+python-3.6.7
diff --git a/test/fixtures/python3_6_7/runtime.txt b/test/fixtures/python3_6_7/runtime.txt
deleted file mode 100644
index 34b35b71..00000000
--- a/test/fixtures/python3_6_7/runtime.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-3.6.7
diff --git a/test/fixtures/python3_6_fail/requirements.txt b/test/fixtures/python3_6_fail/requirements.txt
new file mode 100644
index 00000000..7e106024
--- /dev/null
+++ b/test/fixtures/python3_6_fail/requirements.txt
@@ -0,0 +1 @@
+flask
diff --git a/test/fixtures/python3_6_fail/runtime.txt b/test/fixtures/python3_6_fail/runtime.txt
new file mode 100644
index 00000000..9fbd3bf0
--- /dev/null
+++ b/test/fixtures/python3_6_fail/runtime.txt
@@ -0,0 +1 @@
+python-3.6.8
diff --git a/test/fixtures/python3_7/runtime.txt b/test/fixtures/python3_7/runtime.txt
index 881a2db1..4255f73a 100644
--- a/test/fixtures/python3_7/runtime.txt
+++ b/test/fixtures/python3_7/runtime.txt
@@ -1 +1 @@
-python-3.7.0
+python-3.7.1
diff --git a/test/fixtures/python3_7_1/runtime.txt b/test/fixtures/python3_7_1/runtime.txt
deleted file mode 100644
index 4255f73a..00000000
--- a/test/fixtures/python3_7_1/runtime.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-3.7.1
diff --git a/test/fixtures/python3_7_fail/requirements.txt b/test/fixtures/python3_7_fail/requirements.txt
new file mode 100644
index 00000000..7e106024
--- /dev/null
+++ b/test/fixtures/python3_7_fail/requirements.txt
@@ -0,0 +1 @@
+flask
diff --git a/test/fixtures/python3_7_fail/runtime.txt b/test/fixtures/python3_7_fail/runtime.txt
new file mode 100644
index 00000000..a01373a3
--- /dev/null
+++ b/test/fixtures/python3_7_fail/runtime.txt
@@ -0,0 +1 @@
+python-3.7.2
diff --git a/test/fixtures/python3_7_warn/requirements.txt b/test/fixtures/python3_7_warn/requirements.txt
new file mode 100644
index 00000000..663bd1f6
--- /dev/null
+++ b/test/fixtures/python3_7_warn/requirements.txt
@@ -0,0 +1 @@
+requests
\ No newline at end of file
diff --git a/test/fixtures/python3_7_warn/runtime.txt b/test/fixtures/python3_7_warn/runtime.txt
new file mode 100644
index 00000000..881a2db1
--- /dev/null
+++ b/test/fixtures/python3_7_warn/runtime.txt
@@ -0,0 +1 @@
+python-3.7.0
diff --git a/test/fixtures/pythonDefault/requirements.txt b/test/fixtures/pythonDefault/requirements.txt
new file mode 100644
index 00000000..7e106024
--- /dev/null
+++ b/test/fixtures/pythonDefault/requirements.txt
@@ -0,0 +1 @@
+flask
diff --git a/test/run b/test/run
index 67d97c8a..6fb50008 100755
--- a/test/run
+++ b/test/run
@@ -87,6 +87,18 @@ testPylibmc() {
assertCapturedSuccess
}
+testPythonDefault() {
+ compile "pythonDefault"
+ assertCaptured "python-3.6.6"
+ assertCapturedSuccess
+}
+
+testPython2() {
+ compile "python2"
+ assertCaptured "python-2.7.15"
+ assertCapturedSuccess
+}
+
testPython2_warn() {
compile "python2_warn"
if [[ $STACK = "heroku-18" ]]; then
@@ -98,31 +110,41 @@ testPython2_warn() {
fi
}
-testPython2() {
- compile "python2"
- assertCaptured "python-2.7.15"
- assertCapturedSuccess
+testPython2_fail() {
+ compile "python2_fail"
+ assertCaptured "Aborting"
+ assertCapturedError
+}
+
+testPython3_4() {
+ compile "python3_4"
+ assertCaptured "python-3.4.9"
+ assertCapturedSuccess
}
-# This fail
testPython3_4_warn() {
compile "python3_4_warn"
if [[ $STACK = "cedar-14" ]]; then
assertCaptured "python-3.4.0"
+ assertCaptured "security update!"
assertCapturedSuccess
else
assertCapturedError
fi
}
-# This fail
-testPython3_4() {
- compile "python3_4"
- assertCaptured "python-3.4.9"
- assertCapturedError
+testPython3_4_fail() {
+ compile "python3_4_fail"
+ assertCaptured "Aborting"
+ assertCapturedError
+}
+
+testPython3_5() {
+ compile "python3_5"
+ assertCaptured "python-3.5.6"
+ assertCapturedSuccess
}
-# This fail
testPython3_5_warn() {
compile "python3_5_warn"
if [[ $STACK = "cedar-14" ]]; then
@@ -134,14 +156,18 @@ testPython3_5_warn() {
fi
}
-# This will fail
-testPython3_5() {
- compile "python3_5"
- assertCaptured "python-3.5.6"
- assertCapturedError
+testPython3_5_fail() {
+ compile "python3_5_fail"
+ assertCaptured "Aborting"
+ assertCapturedError
+}
+
+testPython3_6() {
+ compile "python3_6"
+ assertCaptured "python-3.6.7"
+ assertCapturedSuccess
}
-# This will warn
testPython3_6_warn() {
compile "python3_6_warn"
assertCaptured "python-3.6.5"
@@ -149,33 +175,36 @@ testPython3_6_warn() {
assertCapturedSuccess
}
-testPython3_6() {
- compile "python3_6"
- assertCaptured "python-3.6.6"
- assertCapturedSuccess
+testPython3_6_fail() {
+ compile "python3_6_fail"
+ assertCaptured "Aborting"
+ assertCapturedError
}
-# This will fail
-testPython3_6_7() {
- compile "python3_6_7"
- assertCaptured "python-3.6.7"
- assertCapturedError
+testPython3_7() {
+ compile "python3_7"
+ if [[ $STACK = "cedar-14" ]]; then
+ assertCapturedError
+ else
+ assertCaptured "python-3.7.1"
+ assertCapturedSuccess
+ fi
}
-testPython3_7() {
+testPython3_7_warn() {
compile "python3_7"
if [[ $STACK = "cedar-14" ]]; then
assertCapturedError
else
assertCaptured "python-3.7.0"
+ assertCaptured "security update!"
assertCapturedSuccess
fi
}
-# This will fail
-testPython3_7_1() {
- compile "python3_7_1"
- assertCaptured "python-3.7.1"
+testPython3_7_fail() {
+ compile "python3_7_warn"
+ assertCaptured "Aborting"
assertCapturedError
}
--
GitLab