Fixes to test.bats with cache and slim

Author: AndrewFarley

test.bats

@@ -8,6 +8,10 @@ setup() {
         export LANG=C.UTF-8
     fi
     export USR_CACHE_DIR=`node -e 'console.log(require("./lib/shared").getUserCachePath())'`
+    # Please note: If you update change the requirements.txt in test/base this value will 
+    # change.  Run a test which uses this variable manually step by step and list the cache
+    # folder to find the new hash if you do this
+    export CACHE_FOLDER_HASH="b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc"
     if [ -d "${USR_CACHE_DIR}" ] ; then
       rm -Rf "${USR_CACHE_DIR}"
     fi
@@ -184,7 +188,7 @@ teardown() {
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true\n    useStaticCache: true/' serverless.yml
     sls package
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    ls $USR_CACHE_DIR/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/flask
+    ls $USR_CACHE_DIR/$CACHE_FOLDER_HASH/flask
     ls $USR_CACHE_DIR/downloadCacheslspyc/http
 }
 
@@ -195,7 +199,7 @@ teardown() {
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true\n    useStaticCache: true/' serverless.yml
     sls --dockerizePip=true package
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    ls $USR_CACHE_DIR/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/flask
+    ls $USR_CACHE_DIR/$CACHE_FOLDER_HASH/flask
     ls $USR_CACHE_DIR/downloadCacheslspyc/http
 }
 
@@ -206,8 +210,8 @@ teardown() {
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useStaticCache: true/' serverless.yml
     sls package
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    ls $USR_CACHE_DIR/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/flask
-    ls $USR_CACHE_DIR/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/.completed_requirements
+    ls $USR_CACHE_DIR/$CACHE_FOLDER_HASH/flask
+    ls $USR_CACHE_DIR/$CACHE_FOLDER_HASH/.completed_requirements
 }
 
 @test "py3.6 uses static cache with cacheLocation option" {
@@ -217,8 +221,8 @@ teardown() {
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useStaticCache: true\n    cacheLocation: .requirements-cache/' serverless.yml
     sls package
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    ls .requirements-cache/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/flask
-    ls .requirements-cache/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/.completed_requirements
+    ls .requirements-cache/$CACHE_FOLDER_HASH/flask
+    ls .requirements-cache/$CACHE_FOLDER_HASH/.completed_requirements
 }
 
 @test "py3.6 checking that static cache actually pulls from cache (by poisoning it)" {
@@ -229,18 +233,30 @@ teardown() {
     sls package
     cp .serverless/sls-py-req-test.zip ./puck
     USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
-    echo "injected new file into static cache folder" > $USR_CACHE_DIR/b8b9d2be59f6f2ea5778e8b2aa4d2ddc_slspyc/injected_file_is_bad_form
+    echo "injected new file into static cache folder" > $USR_CACHE_DIR/$CACHE_FOLDER_HASH/injected_file_is_bad_form
     sls package
     [ `wc -c ./.serverless/sls-py-req-test.zip | awk '{ print $1 }'` -gt `wc -c ./puck | awk '{ print $1 }'` ]
 }
 
-@test "py3.6 uses cache with dockerizePip & slim option" {
+@test "py3.6 uses static cache with dockerizePip & slim option" {
     cd tests/base
     npm i $(npm pack ../..)
     ! uname -sm|grep Linux || groups|grep docker || id -u|egrep '^0$' || skip "can't dockerize on linux if not root & not in docker group"
     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useStaticCache: true/' serverless.yml
-    sls --slim=true package
-    ls .requirements-cache/http
+    sls --dockerizePip=true --slim=true package
+    ls $USR_CACHE_DIR/$CACHE_FOLDER_HASH/flask
+    unzip .serverless/sls-py-req-test.zip -d puck
+    test $(find puck -name "*.pyc" | wc -l) -eq 0
+}
+
+@test "py3.6 uses download cache with dockerizePip & slim option" {
+    cd tests/base
+    npm i $(npm pack ../..)
+    ! uname -sm|grep Linux || groups|grep docker || id -u|egrep '^0$' || skip "can't dockerize on linux if not root & not in docker group"
+    perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true/' serverless.yml
+    sls --dockerizePip=true --slim=true package
+    ls $USR_CACHE_DIR/downloadCacheslspyc/http
+    unzip .serverless/sls-py-req-test.zip -d puck
     test $(find puck -name "*.pyc" | wc -l) -eq 0
 }