adding more tests and fixing a bug with pip not using download cache without docker

Author: AndrewFarley

lib/pip.js

@@ -62,6 +62,14 @@ function installRequirements(targetFolder, servicePath, serverless, options) {
     // Push our local OS-specific paths for requirements and target directory
     pipCmd.push('-t', targetFolder);
     pipCmd.push('-r', targetRequirementsTxt);
+    
+    // If we want a download cache...
+    if (options.useDownloadCache) {
+      const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCache_slspyc');
+      serverless.cli.log(`Using download cache directory ${downloadCacheDir}`);
+      fse.ensureDirSync(downloadCacheDir);
+      pipCmd.push('--cache-dir', downloadCacheDir);
+    }
 
     // Check if pip has Debian's --system option and set it if so
     const pipTestRes = spawnSync(
@@ -139,15 +147,6 @@ function installRequirements(targetFolder, servicePath, serverless, options) {
   } else {
     cmd = pipCmd[0];
     cmdOptions = pipCmd.slice(1);
-    
-    // If we want a download cache...
-    if (options.useDownloadCache) {
-      const downloadCacheDir = path.join(getUserCachePath(options), 'downloadCache_slspyc');
-      serverless.cli.log(`Using download cache directory ${downloadCacheDir}`);
-      fse.ensureDirSync(downloadCacheDir);
-      pipCmd.push('--cache-dir', downloadCacheDir);
-    }
-
   }
   serverless.cli.log(`Trying to run command...`);
   console.log(cmd)

test.bats

@@ -12,6 +12,8 @@ setup() {
 teardown() {
     rm -rf puck puck2 puck3 node_modules .serverless .requirements.zip .requirements-cache
     if [ -f serverless.yml.bak ]; then mv serverless.yml.bak serverless.yml; fi
+    # Remove our items in appdirs user cache dir
+    node -e 'require("../../lib/clean").cleanupStaticCache()'
 }
 
 @test "py3.6 can package flask with default options" {
@@ -67,13 +69,42 @@ teardown() {
     ls puck/flask
 }
 
-@test "py3.6 uses cache with dockerizePip option" {
+@test "py3.6 uses download cache with useDownloadCache 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    pipCmdExtraArgs: ["--cache-dir", ".requirements-cache"]/' serverless.yml
+    perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true/' serverless.yml
+    sls package
+    USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
+    ls $USR_CACHE_DIR/downloadCache_slspyc/http
+}
+
+@test "py3.6 uses download cache with useDownloadCache + cacheLocation 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\n    cacheLocation: .requirements-cache/' serverless.yml
+    sls package
+    ls .requirements-cache/downloadCache_slspyc/http
+}
+
+@test "py3.6 uses download cache with dockerizePip + useDownloadCache 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 package
+    USR_CACHE_DIR=`node -e 'console.log(require("../../lib/shared").getUserCachePath())'`
+    ls $USR_CACHE_DIR/downloadCache_slspyc/http
+}
+
+@test "py3.6 uses download cache with dockerizePip + useDownloadCache + cacheLocation 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\n    cacheLocation: .requirements-cache/' serverless.yml
     sls --dockerizePip=true package
-    ls .requirements-cache/http
+    ls .requirements-cache/downloadCache_slspyc/http
 }
 
 @test "py2.7 can package flask with default options" {