start moving caching tests to tape

Author: bweigel

test.bats

@@ -1,5 +1,10 @@
 #!/usr/bin/env bats
 
+run_only_test() {
+  if [ "$BATS_TEST_NUMBER" -ne "$1" ]; then
+    skip
+  fi
+}
 
 setup() {
     export SLS_DEBUG=t
@@ -14,6 +19,7 @@ setup() {
     if [ -d "${USR_CACHE_DIR}" ] ; then
       rm -Rf "${USR_CACHE_DIR}"
     fi
+ #   run_only_test 42
 }
 
 teardown() {
@@ -146,22 +152,22 @@ teardown() {
     test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0  
 }
 
-@test "py3.6 uses download cache with useDownloadCache option" {
-    cd tests/base
-    npm i $(npm pack ../..)
-    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/downloadCacheslspyc/http
-}
-
-@test "py3.6 uses download cache with cacheLocation option" {
-    cd tests/base
-    npm i $(npm pack ../..)
-    perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true\n    cacheLocation: .requirements-cache/' serverless.yml
-    sls package
-    ls .requirements-cache/downloadCacheslspyc/http
-}
+# @test "py3.6 uses download cache with useDownloadCache option" {
+#     cd tests/base
+#     npm i $(npm pack ../..)
+#     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/downloadCacheslspyc/http
+# }
+
+# @test "py3.6 uses download cache with cacheLocation option" {
+#     cd tests/base
+#     npm i $(npm pack ../..)
+#     perl -p -i'.bak' -e 's/(pythonRequirements:$)/\1\n    useDownloadCache: true\n    cacheLocation: .requirements-cache/' serverless.yml
+#     sls package
+#     ls .requirements-cache/downloadCacheslspyc/http
+# }
 
 @test "py3.6 uses download cache with dockerizePip option" {
     cd tests/base

test.js

@@ -3,7 +3,7 @@ const deasync = require('deasync-promise');
 const glob = require('glob-all');
 const JSZip = require('jszip');
 const tape = require('tape');
-const { removeSync, readFileSync } = require('fs-extra');
+const { removeSync, readFileSync, pathExistsSync } = require('fs-extra');
 const { sep } = require('path');
 
 const { getUserCachePath } = require('./lib/shared');
@@ -592,6 +592,35 @@ test('can package individually, moving modules to root of zip-File with Individu
   t.end();
 });
 
+test('py3.6 uses download cache with useDownloadCache option', t => {
+  process.chdir('tests/base');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  sls(['--useDownloadCache=true', 'package']);
+
+  const cachepath = getUserCachePath()
+  t.true(
+    pathExistsSync(`${cachepath}${sep}downloadCacheslspyc${sep}http`),
+    'cache directoy exists'
+  );
+
+  t.end();
+});
+
+test('py3.6 uses download cache with cacheLocation option', t => {
+  process.chdir('tests/base');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  sls(['--useDownloadCache=true', '--cacheLocation=.requirements-cache', 'package']);
+
+  t.true(
+    pathExistsSync(`.requirements-cache${sep}downloadCacheslspyc${sep}http`),
+    'cache directoy exists'
+  );
+
+  t.end();
+});
+
 /*
  * News tests not in test.bats
  */

tests/base/serverless.yml

@@ -17,6 +17,7 @@ custom:
     IndividuallyMoveUpModules: ${opt:moveup, self:custom.defaults.IndividuallyMoveUpModules}
     useStaticCache: ${opt:useStaticCache, self:custom.defaults.useStaticCache}
     useDownloadCache: ${opt:useDownloadCache, self:custom.defaults.useDownloadCache}
+    cacheLocation: ${opt:cacheLocation, self:custom.defaults.cacheLocation}
   defaults:
     slim: false
     slimPatterns: false
@@ -26,6 +27,7 @@ custom:
     IndividuallyMoveUpModules: true
     useStaticCache: false
     useDownloadCache: false
+    cacheLocation: ''
 
 package:
   individually: ${opt:individually, self:custom.defaults.individually}
@@ -53,12 +55,12 @@ functions:
     module: fn2
     package:
       include:
-        - 'fn2/**'  
+        - 'fn2/**'
         - 'common/__init__.py'
   hello6:
     handler: fn3.fn3_handler.hello
     module: fn3
     package:
       include:
-        - 'fn3/**'  
-        - 'common/__init__.py'        
+        - 'fn3/**'
+        - 'common/__init__.py'