start implementing tests

Author: bweigel

lib/inject.js

@@ -116,10 +116,10 @@ function injectAllRequirements(funcArtifact) {
         return this.options.zip
           ? func
           : injectRequirements(
-            path.join('.serverless', func.module, 'requirements'),
-            func.package.artifact,
-            this.options
-          );
+              path.join('.serverless', func.module, 'requirements'),
+              func.package.artifact,
+              this.options
+            );
       });
   } else if (!this.options.zip) {
     return injectRequirements(

test.js

@@ -134,3 +134,19 @@ test('py3.6 can package flask with slim option', t => {
   );
   t.end();
 });
+
+test('can package individually without moving modules to root of zip-File', t => {
+  process.chdir('tests/base');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  sls(['--individually=true', '--moveup=false', 'package']);
+  const zipfiles = listZipFiles(
+    '.serverless/fn2-sls-py-req-test-dev-hello4.zip'
+  );
+  t.true(
+    zipfiles.includes(`fn2${sep}__init__.py`),
+    'fn2 is packaged as module'
+  );
+  t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
+  t.end();
+});

tests/base/fn2/__init__.py

@@ -0,0 +1,5 @@
+import requests
+
+
+def hello(event, context):
+    return requests.get("https://httpbin.org/get").json()

tests/base/fn2/handler.py

@@ -14,12 +14,14 @@ custom:
     slimPatterns: ${file(./slimPatterns.yml):slimPatterns, self:custom.defaults.slimPatterns}
     vendor: ${opt:vendor, ''}
     fileName: ${opt:fileName, 'requirements.txt'}
+    IndividuallyMoveUpModules: ${opt:moveup, self:custom.defaults.IndividuallyMoveUpModules}
   defaults:
     slim: false
     slimPatterns: false
     zip: false
     dockerizePip: false
     individually: false
+    IndividuallyMoveUpModules: true
 
 package:
   individually: ${opt:individually, self:custom.defaults.individually}
@@ -36,3 +38,9 @@ functions:
   hello3:
     handler: handler.hello
     runtime: nodejs6.10
+  hello4:
+    handler: fn2.handler.hello
+    module: fn2
+    package:
+      include:
+        - 'fn2/**'