test: add test for injection path with scaleway provider

Author: cyclimse

test.js

@@ -22,30 +22,30 @@ const initialWorkingDir = process.cwd();
 
 const mkCommand =
   (cmd) =>
-  (args, options = {}) => {
-    options['env'] = Object.assign(
-      { SLS_DEBUG: 'true' },
-      process.env,
-      options['env']
-    );
-    const { error, stdout, stderr, status } = crossSpawn.sync(
-      cmd,
-      args,
-      options
-    );
-    if (error && !options['noThrow']) {
-      console.error(`Error running: ${quote([cmd, ...args])}`); // eslint-disable-line no-console
-      throw error;
-    }
-    if (status && !options['noThrow']) {
-      console.error('STDOUT: ', stdout.toString()); // eslint-disable-line no-console
-      console.error('STDERR: ', stderr.toString()); // eslint-disable-line no-console
-      throw new Error(
-        `${quote([cmd, ...args])} failed with status code ${status}`
+    (args, options = {}) => {
+      options['env'] = Object.assign(
+        { SLS_DEBUG: 'true' },
+        process.env,
+        options['env']
       );
-    }
-    return stdout && stdout.toString().trim();
-  };
+      const { error, stdout, stderr, status } = crossSpawn.sync(
+        cmd,
+        args,
+        options
+      );
+      if (error && !options['noThrow']) {
+        console.error(`Error running: ${quote([cmd, ...args])}`); // eslint-disable-line no-console
+        throw error;
+      }
+      if (status && !options['noThrow']) {
+        console.error('STDOUT: ', stdout.toString()); // eslint-disable-line no-console
+        console.error('STDERR: ', stderr.toString()); // eslint-disable-line no-console
+        throw new Error(
+          `${quote([cmd, ...args])} failed with status code ${status}`
+        );
+      }
+      return stdout && stdout.toString().trim();
+    };
 
 const sls = mkCommand('sls');
 const git = mkCommand('git');
@@ -421,7 +421,7 @@ test(
     );
     t.true(
       zipfiles.filter((filename) => filename.endsWith('__main__.py')).length >
-        0,
+      0,
       '__main__.py files are packaged'
     );
     t.end();
@@ -1654,3 +1654,14 @@ test('poetry py3.7 fails packaging if poetry.lock is missing and flag requirePoe
   );
   t.end();
 });
+
+test('py3.7 injects dependencies into `package` folder when using scaleway provider', async (t) => {
+  process.chdir('tests/scaleway_provider');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  sls(['package'], { env: {} });
+  const zipfiles = await listZipFiles('.serverless/sls-py-req-test.zip');
+  t.true(zipfiles.includes(`package${sep}flask${sep}__init__.py`), 'flask is packaged');
+  t.true(zipfiles.includes(`package${sep}boto3${sep}__init__.py`), 'boto3 is packaged');
+  t.end();
+});

tests/scaleway_provider/_slimPatterns.yml

@@ -0,0 +1,2 @@
+slimPatterns:
+  - '**/__main__.py'

tests/scaleway_provider/handler.py

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

tests/scaleway_provider/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "example",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz",
+    "serverless-scaleway-functions": "^0.4.5"
+  }
+}

tests/scaleway_provider/requirements.txt

@@ -0,0 +1,3 @@
+flask==0.12.5
+bottle
+boto3

tests/scaleway_provider/serverless.yml

@@ -0,0 +1,34 @@
+service: sls-py-req-test
+
+configValidationMode: off
+
+provider:
+  name: scaleway
+  runtime: python37
+
+plugins:
+  - serverless-python-requirements
+  - serverless-scaleway-functions
+
+custom:
+  pythonRequirements:
+    zip: ${env:zip, self:custom.defaults.zip}
+    slim: ${env:slim, self:custom.defaults.slim}
+    slimPatterns: ${file(./slimPatterns.yml):slimPatterns, self:custom.defaults.slimPatterns}
+    slimPatternsAppendDefaults: ${env:slimPatternsAppendDefaults, self:custom.defaults.slimPatternsAppendDefaults}
+    dockerizePip: ${env:dockerizePip, self:custom.defaults.dockerizePip}
+  defaults:
+    zip: false
+    slimPatterns: false
+    slimPatternsAppendDefaults: true
+    slim: false
+    dockerizePip: false
+
+package:
+  patterns:
+    - '!**/*'
+    - 'handler.py'
+
+functions:
+  hello:
+    handler: handler.hello