From 1cedaead71c05f0ae64e783d01878681c4f81b36 Mon Sep 17 00:00:00 2001
From: abetomo <taneaki@gmail.com>
Date: Wed, 19 Apr 2017 14:02:33 +0900
Subject: [PATCH 1/6] Add `use strict`

---
 test/main.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/main.js b/test/main.js
index 659e3105..ea9cba2f 100644
--- a/test/main.js
+++ b/test/main.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var chai = require('chai');
 var program = require('commander');
 var fs = require('fs');

From fa2f8e94c6ffc791f78a4a09bbcb553f1e80497a Mon Sep 17 00:00:00 2001
From: abetomo <taneaki@gmail.com>
Date: Wed, 19 Apr 2017 14:04:30 +0900
Subject: [PATCH 2/6] Fix to require `fs-extra`

Fixed the requirement of `fs` twice
---
 test/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/main.js b/test/main.js
index ea9cba2f..41218879 100644
--- a/test/main.js
+++ b/test/main.js
@@ -2,10 +2,9 @@
 
 var chai = require('chai');
 var program = require('commander');
-var fs = require('fs');
+var fs = require('fs-extra');
 var Hoek = require('hoek');
 var lambda = require('../lib/main');
-var fs = require('fs');
 var _ = require('lodash');
 var zip = require('node-zip');
 var rimraf = require('rimraf');

From 2daf1ada7b5b57436444647ce6ffd414ee1bb18d Mon Sep 17 00:00:00 2001
From: abetomo <taneaki@gmail.com>
Date: Wed, 19 Apr 2017 14:06:34 +0900
Subject: [PATCH 3/6] Add deletion of working directory

Because the directory `/tmp/undefined-149XXXX/` remained
after running the test
---
 test/main.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/main.js b/test/main.js
index 41218879..efb11bc4 100644
--- a/test/main.js
+++ b/test/main.js
@@ -38,6 +38,10 @@ describe('node-lambda', function () {
     program = Hoek.clone(originalProgram);
   });
 
+  after(function () {
+    fs.removeSync(codeDirectory);
+  });
+
   it('version should be set', function () {
     assert.equal(lambda.version, '0.9.0');
   });

From 50ce8c0cf4fb0b05060ff232b5db9d652955da36 Mon Sep 17 00:00:00 2001
From: abetomo <taneaki@gmail.com>
Date: Wed, 19 Apr 2017 14:47:17 +0900
Subject: [PATCH 4/6] Fix to run `_codeDirectory` with valid values

It had a value like `/tmp/undefined-149XXXX/`
---
 test/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/main.js b/test/main.js
index efb11bc4..fca8e01f 100644
--- a/test/main.js
+++ b/test/main.js
@@ -31,7 +31,7 @@ var originalProgram = {
   prebuiltDirectory: '',
 };
 
-var codeDirectory = lambda._codeDirectory(program);
+var codeDirectory = lambda._codeDirectory(Hoek.clone(originalProgram));
 
 describe('node-lambda', function () {
   beforeEach(function () {

From f1cca53f4907cbfeb1b822c41ad9a0dbfa647b6d Mon Sep 17 00:00:00 2001
From: abetomo <taneaki@gmail.com>
Date: Wed, 19 Apr 2017 14:51:52 +0900
Subject: [PATCH 5/6] Add deletion of working directory

After executing the test, the directory `/tmp/node-lambda-149XXX/`
and the zip file `/tmp/node-lambda-149XXX.zip` remained.
---
 test/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/main.js b/test/main.js
index fca8e01f..279ac17d 100644
--- a/test/main.js
+++ b/test/main.js
@@ -39,7 +39,8 @@ describe('node-lambda', function () {
   });
 
   after(function () {
-    fs.removeSync(codeDirectory);
+    this.timeout(30000); // give it time to remove
+    fs.removeSync(`/tmp/${program.functionName}-[0-9]*`);
   });
 
   it('version should be set', function () {

From eb3c3b5dd7e22f0718adbe40dcf1db07b634b87e Mon Sep 17 00:00:00 2001
From: abetomo <taneaki@gmail.com>
Date: Wed, 19 Apr 2017 14:56:15 +0900
Subject: [PATCH 6/6] Change to functionName which is difficult to duplicate
 with each user's functionName

Added a process to delete files under `/tmp/`
---
 test/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/main.js b/test/main.js
index 279ac17d..ba75e1d8 100644
--- a/test/main.js
+++ b/test/main.js
@@ -16,7 +16,7 @@ var originalProgram = {
   accessKey: 'key',
   secretKey: 'secret',
   sessionToken: 'token',
-  functionName: 'node-lambda',
+  functionName: '___node-lambda',
   handler: 'index.handler',
   role: 'some:arn:aws:iam::role',
   memorySize: 128,
@@ -50,19 +50,19 @@ describe('node-lambda', function () {
   describe('_params', function () {
     it('appends environment to original functionName', function () {
       var params = lambda._params(program);
-      assert.equal(params.FunctionName, 'node-lambda-development');
+      assert.equal(params.FunctionName, '___node-lambda-development');
     });
 
     it('appends environment to original functionName (production)', function () {
       program.environment = 'production';
       var params = lambda._params(program);
-      assert.equal(params.FunctionName, 'node-lambda-production');
+      assert.equal(params.FunctionName, '___node-lambda-production');
     });
 
     it('appends version to original functionName', function () {
       program.lambdaVersion = '2015-02-01';
       var params = lambda._params(program);
-      assert.equal(params.FunctionName, 'node-lambda-development-2015-02-01');
+      assert.equal(params.FunctionName, '___node-lambda-development-2015-02-01');
     });
 
     it('appends VpcConfig to params when vpc params set', function() {