adds more tests

Author: bweigel

test.js

@@ -148,6 +148,7 @@ test('can package individually without moving modules to root of zip-File', t =>
   npm(['i', path]);
   sls(['--individually=true', '--moveup=false', 'package']);
 
+
   const zipfiles_hello = listZipFiles('.serverless/hello.zip');
   t.false(
     zipfiles_hello.includes(`fn2${sep}__init__.py`),
@@ -179,6 +180,10 @@ test('can package individually without moving modules to root of zip-File', t =>
     zipfiles_hello4.includes(`flask${sep}__init__.py`),
     'flask is not packaged in function hello4'
   );
+  t.false(
+    zipfiles_hello4.includes(`common${sep}__init__.py`),
+    'module common is not packaged in function hello4'
+  );
 
   const zipfiles_hello5 = listZipFiles('.serverless/hello5.zip');
   t.true(
@@ -193,6 +198,32 @@ test('can package individually without moving modules to root of zip-File', t =>
     zipfiles_hello5.includes(`flask${sep}__init__.py`),
     'flask is not packaged in function hello5'
   );
+  t.true(
+    zipfiles_hello5.includes(`common${sep}__init__.py`),
+    'module common is packaged in function hello5'
+  );
+
+  const zipfiles_hello6 = listZipFiles('.serverless/hello6.zip');
+  t.true(
+    zipfiles_hello6.includes(`fn3${sep}__init__.py`),
+    'fn3 is packaged as module in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`fn2${sep}__init__.py`),
+    'fn2 is not packaged in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`dataclasses.py`),
+    'dataclasses is packaged in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`flask${sep}__init__.py`),
+    'flask is not packaged in function hello6'
+  );
+  t.true(
+    zipfiles_hello6.includes(`common${sep}__init__.py`),
+    'module common is packaged in function hello6'
+  );
 
   t.end();
 });
@@ -234,6 +265,10 @@ test('can package individually without moving modules to root of zip-File with o
     zipfiles_hello4.includes(`flask${sep}__init__.py`),
     'flask is not packaged in function hello4'
   );
+  t.false(
+    zipfiles_hello4.includes(`common${sep}__init__.py`),
+    'module common is not packaged in function hello4'
+  );
 
   const zipfiles_hello5 = listZipFiles('.serverless/hello5.zip');
   t.true(
@@ -248,6 +283,32 @@ test('can package individually without moving modules to root of zip-File with o
     zipfiles_hello5.includes(`flask${sep}__init__.py`),
     'flask is not packaged in function hello5'
   );
+  t.true(
+    zipfiles_hello5.includes(`common${sep}__init__.py`),
+    'module common is packaged in function hello5'
+  );
+
+  const zipfiles_hello6 = listZipFiles('.serverless/hello6.zip');
+  t.true(
+    zipfiles_hello6.includes(`fn3${sep}__init__.py`),
+    'fn3 is packaged as module in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`fn2${sep}__init__.py`),
+    'fn2 is not packaged in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`dataclasses.py`),
+    'dataclasses is packaged in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`flask${sep}__init__.py`),
+    'flask is not packaged in function hello6'
+  );
+  t.true(
+    zipfiles_hello6.includes(`common${sep}__init__.py`),
+    'module common is packaged in function hello6'
+  );
 
   t.end();
 });
@@ -258,6 +319,7 @@ test('can package individually without moving modules to root of zip-File with u
   npm(['i', path]);
   sls(['--individually=true', '--moveup=false', '--useStaticCache=true', '--useDownloadCache=true', 'package']);
 
+
   const zipfiles_hello = listZipFiles('.serverless/hello.zip');
   t.false(
     zipfiles_hello.includes(`fn2${sep}__init__.py`),
@@ -289,6 +351,10 @@ test('can package individually without moving modules to root of zip-File with u
     zipfiles_hello4.includes(`flask${sep}__init__.py`),
     'flask is not packaged in function hello4'
   );
+  t.false(
+    zipfiles_hello4.includes(`common${sep}__init__.py`),
+    'module common is not packaged in function hello4'
+  );
 
   const zipfiles_hello5 = listZipFiles('.serverless/hello5.zip');
   t.true(
@@ -303,6 +369,32 @@ test('can package individually without moving modules to root of zip-File with u
     zipfiles_hello5.includes(`flask${sep}__init__.py`),
     'flask is not packaged in function hello5'
   );
+  t.true(
+    zipfiles_hello5.includes(`common${sep}__init__.py`),
+    'module common is packaged in function hello5'
+  );
+
+  const zipfiles_hello6 = listZipFiles('.serverless/hello6.zip');
+  t.true(
+    zipfiles_hello6.includes(`fn3${sep}__init__.py`),
+    'fn3 is packaged as module in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`fn2${sep}__init__.py`),
+    'fn2 is not packaged in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`dataclasses.py`),
+    'dataclasses is packaged in function hello6'
+  );
+  t.false(
+    zipfiles_hello6.includes(`flask${sep}__init__.py`),
+    'flask is not packaged in function hello6'
+  );
+  t.true(
+    zipfiles_hello6.includes(`common${sep}__init__.py`),
+    'module common is packaged in function hello6'
+  );
 
   t.end();
 });

tests/base/fn3/__init__.py

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

tests/base/fn3/handler.py

@@ -55,3 +55,10 @@ functions:
       include:
         - 'fn2/**'  
         - 'common/__init__.py'
+  hello6:
+    handler: fn3.handler.hello
+    module: fn3
+    package:
+      include:
+        - 'fn3/**'  
+        - 'common/__init__.py'