Skip to content

Commit 1beee59

Browse files
committed
ugh. zip files in windows get windows style separators.
1 parent 9d903af commit 1beee59

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

test.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const glob = require('glob-all');
44
const JSZip = require('jszip');
55
const tape = require('tape');
66
const { removeSync, readFileSync, readdirSync } = require('fs-extra');
7+
const { sep } = require('path');
78

89
const { getUserCachePath } = require('./lib/shared');
910

@@ -87,7 +88,7 @@ test('default pythonBin can package flask with default options', t => {
8788
npm(['i', path]);
8889
sls(['package']);
8990
const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
90-
t.true(zipfiles.includes('flask/__init__.py'), 'flask is packaged');
91+
t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
9192
t.end();
9293
});
9394

@@ -97,7 +98,7 @@ test('py3.6 can package flask with default options', t => {
9798
npm(['i', path]);
9899
sls([`--pythonBin=${getPythonBin(3)}`, 'package']);
99100
const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
100-
t.true(zipfiles.includes('flask/__init__.py'), 'flask is packaged');
101+
t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
101102
t.end();
102103
});
103104

@@ -111,9 +112,9 @@ test('py3.6 can package flask with zip option', t => {
111112
zipfiles.includes('.requirements.zip'),
112113
'zipped requirements are packaged'
113114
);
114-
t.true(zipfiles.includes('unzip_requirements.py'), 'unzip util is packaged');
115+
t.true(zipfiles.includes(`unzip_requirements.py`), 'unzip util is packaged');
115116
t.false(
116-
zipfiles.includes('flask/__init__.py'),
117+
zipfiles.includes(`flask${sep}__init__.py`),
117118
"flask isn't packaged on its own"
118119
);
119120
t.end();
@@ -125,7 +126,7 @@ test('py3.6 can package flask with slim option', t => {
125126
npm(['i', path]);
126127
sls([`--pythonBin=${getPythonBin(3)}`, '--slim=true', 'package']);
127128
const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
128-
t.true(zipfiles.includes('flask/__init__.py'), 'flask is packaged');
129+
t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
129130
t.deepEqual(
130131
zipfiles.filter(filename => filename.endsWith('.pyc')),
131132
[],

tests/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"author": "",
1010
"license": "ISC",
1111
"dependencies": {
12-
"serverless-python-requirements": "file:serverless-python-requirements-4.2.1.tgz"
12+
"serverless-python-requirements": "file:serverless-python-requirements-4.2.4.tgz"
1313
}
1414
}

0 commit comments

Comments
 (0)