fix install bug when using command line (#319)

alibaba · Aug 6, 2019 · 3c08b5c · 3c08b5c
1 parent 9fd1cbb
commit 3c08b5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -13,11 +13,9 @@ validate-lint:
 	@npm run validate-lint
 
 integration-test:
-	echo "@mocha $(TEST_FOLDER) -t $(TIMEOUT) -R spec --recursive  -name $(TEST_FILES) --grep ^Integration::"
 	@mocha $(TEST_FOLDER) -t $(TIMEOUT) -R spec --recursive  -name $(TEST_FILES) --grep ^Integration::
 
 unit-test:
-	echo "@mocha $(TEST_FOLDER) -t $(TIMEOUT) -R spec --recursive -name $(TEST_FILES) --grep '^(?!Integration::).*'"
 	@mocha $(TEST_FOLDER) -t $(TIMEOUT) -R spec --recursive -name $(TEST_FILES) --grep '^(?!Integration::).*'
 
 test: lint unit-test

diff --git a/lib/install/install.js b/lib/install/install.js
@@ -14,11 +14,11 @@ async function installPackage(runtime, pkgType, pkgName, options) {
 
     case 'apt':
       await new AptTask(options.name, runtime, options.codeUri, 
-        pkgName, options.local, options.env, ctx, options.verbose).run();
+        pkgName, options.local, null, options.env, ctx, options.verbose).run();
       break;
     case 'pip':
       await new PipTask(options.name, runtime, options.codeUri, 
-        pkgName, options.local, options.env, ctx, options.verbose).run();
+        pkgName, options.local, null, options.env, ctx, options.verbose).run();
       break;
     case 'module':
       // TODO

diff --git a/test/install/install.test.js b/test/install/install.test.js
@@ -35,19 +35,20 @@ chai.use(require('chai-fs'));
     await installPackage('python2.7', 'apt', 'libzbar0', {
       packageType: 'apt',
       codeUri: funTempDir,
-      local: true
+      local: true,
+      env: {}
     });
 
     expect(path.join(funTempDir, '.fun/root/usr/lib/libzbar.so.0')).to.be.a.path();
-
   });
 
   it('install_pip', async function () {
     this.timeout(20000);
     await installPackage('python2.7', 'pip', 'pymssql', {
       packageType: 'pip',
       codeUri: funTempDir,
-      local: true
+      local: true,
+      env: {}
     });
 
     expect(path.join(funTempDir, '.fun/python/lib/python2.7/site-packages/pymssql.so')).to.be.a.path();