From 24f1d0c4308992ff433da25d217f6fcd46ca2e28 Mon Sep 17 00:00:00 2001
From: Ethan Setnik <esetnik@gmail.com>
Date: Tue, 28 Apr 2020 16:04:43 -0400
Subject: [PATCH] fix validation of logging for test run

---
 .../test-dynamodb-streams.js                  | 54 ++++++++--------
 .../test-kinesis.js                           | 62 +++++++++----------
 2 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/tests/serverless-plugins-integration/test-dynamodb-streams.js b/tests/serverless-plugins-integration/test-dynamodb-streams.js
index 858fb211..e6977293 100644
--- a/tests/serverless-plugins-integration/test-dynamodb-streams.js
+++ b/tests/serverless-plugins-integration/test-dynamodb-streams.js
@@ -1,53 +1,49 @@
 /* eslint-disable unicorn/no-process-exit */
-const { Writable } = require("stream");
-const { spawn } = require("child_process");
-const onExit = require("signal-exit");
-const { DynamoDB } = require("aws-sdk");
+const {Writable} = require('stream');
+const {spawn} = require('child_process');
+const onExit = require('signal-exit');
+const {DynamoDB} = require('aws-sdk');
 
 const client = new DynamoDB({
-  region: "eu-west-1",
-  accessKeyId: "local",
-  secretAccessKey: "local",
-  endpoint: "http://localhost:8000",
+  region: 'eu-west-1',
+  accessKeyId: 'local',
+  secretAccessKey: 'local',
+  endpoint: 'http://localhost:8000'
 });
 
 const putItems = () => {
   return Promise.all([
     client
       .putItem({
-        Item: { id: { S: "MyFirstId" } },
-        TableName: "MyFirstTable",
+        Item: {id: {S: 'MyFirstId'}},
+        TableName: 'MyFirstTable'
       })
       .promise(),
     client
       .putItem({
-        Item: { id: { S: "MySecondId" } },
-        TableName: "MySecondTable",
+        Item: {id: {S: 'MySecondId'}},
+        TableName: 'MySecondTable'
       })
       .promise(),
     client
       .putItem({
-        Item: { id: { S: "MyThirdId" } },
-        TableName: "MyThirdTable",
+        Item: {id: {S: 'MyThirdId'}},
+        TableName: 'MyThirdTable'
       })
       .promise(),
     client
       .putItem({
-        Item: { id: { S: "MyFourthId" } },
-        TableName: "MyFourthTable",
+        Item: {id: {S: 'MyFourthId'}},
+        TableName: 'MyFourthTable'
       })
-      .promise(),
+      .promise()
   ]);
 };
 
-const serverless = spawn(
-  "serverless",
-  ["--config", "serverless.dynamodb-stream.yml", "offline"],
-  {
-    stdio: ["pipe", "pipe", "pipe"],
-    cwd: __dirname,
-  }
-);
+const serverless = spawn('serverless', ['--config', 'serverless.dynamodb-stream.yml', 'offline'], {
+  stdio: ['pipe', 'pipe', 'pipe'],
+  cwd: __dirname
+});
 
 serverless.stdout.pipe(
   new Writable({
@@ -61,20 +57,20 @@ serverless.stdout.pipe(
       this.count = (this.count || 0) + (output.match(/\[✔]/g) || []).length;
       if (this.count === 4) serverless.kill();
       cb();
-    },
+    }
   })
 );
 
-serverless.stdout.on("data", (data) => {
+serverless.stdout.on('data', data => {
   console.log(data.toString());
 });
 
-serverless.stderr.on("data", (data) => {
+serverless.stderr.on('data', data => {
   console.error(data.toString());
   process.exit(1);
 });
 
-serverless.on("close", (code) => {
+serverless.on('close', code => {
   process.exit(code);
 });
 
diff --git a/tests/serverless-plugins-integration/test-kinesis.js b/tests/serverless-plugins-integration/test-kinesis.js
index bb42f25c..fed58488 100644
--- a/tests/serverless-plugins-integration/test-kinesis.js
+++ b/tests/serverless-plugins-integration/test-kinesis.js
@@ -1,57 +1,53 @@
 /* eslint-disable unicorn/no-process-exit */
-const { Writable } = require("stream");
-const { spawn } = require("child_process");
-const onExit = require("signal-exit");
-const { Kinesis } = require("aws-sdk");
+const {Writable} = require('stream');
+const {spawn} = require('child_process');
+const onExit = require('signal-exit');
+const {Kinesis} = require('aws-sdk');
 
 const client = new Kinesis({
-  region: "eu-west-1",
-  accessKeyId: "local",
-  secretAccessKey: "local",
-  endpoint: "http://localhost:4567",
+  region: 'eu-west-1',
+  accessKeyId: 'local',
+  secretAccessKey: 'local',
+  endpoint: 'http://localhost:4567'
 });
 
 const putRecords = () => {
   return Promise.all([
     client
       .putRecord({
-        StreamName: "MyFirstStream",
-        PartitionKey: "MyFirstMessage",
-        Data: "MyFirstMessage",
+        StreamName: 'MyFirstStream',
+        PartitionKey: 'MyFirstMessage',
+        Data: 'MyFirstMessage'
       })
       .promise(),
     client
       .putRecord({
-        StreamName: "MySecondStream",
-        PartitionKey: "MySecondMessage",
-        Data: "MySecondMessage",
+        StreamName: 'MySecondStream',
+        PartitionKey: 'MySecondMessage',
+        Data: 'MySecondMessage'
       })
       .promise(),
     client
       .putRecord({
-        StreamName: "MyThirdStream",
-        PartitionKey: "MyThirdMessage",
-        Data: "MyThirdMessage",
+        StreamName: 'MyThirdStream',
+        PartitionKey: 'MyThirdMessage',
+        Data: 'MyThirdMessage'
       })
       .promise(),
     client
       .putRecord({
-        StreamName: "MyFourthStream",
-        PartitionKey: "MyFourthMessage",
-        Data: "MyFourthMessage",
+        StreamName: 'MyFourthStream',
+        PartitionKey: 'MyFourthMessage',
+        Data: 'MyFourthMessage'
       })
-      .promise(),
+      .promise()
   ]);
 };
 
-const serverless = spawn(
-  "serverless",
-  ["--config", "serverless.kinesis.yml", "offline"],
-  {
-    stdio: ["pipe", "pipe", "pipe"],
-    cwd: __dirname,
-  }
-);
+const serverless = spawn('serverless', ['--config', 'serverless.kinesis.yml', 'offline'], {
+  stdio: ['pipe', 'pipe', 'pipe'],
+  cwd: __dirname
+});
 
 serverless.stdout.pipe(
   new Writable({
@@ -65,20 +61,20 @@ serverless.stdout.pipe(
       this.count = (this.count || 0) + (output.match(/\[✔]/g) || []).length;
       if (this.count === 4) serverless.kill();
       cb();
-    },
+    }
   })
 );
 
-serverless.stdout.on("data", (data) => {
+serverless.stdout.on('data', data => {
   console.log(data.toString());
 });
 
-serverless.stderr.on("data", (data) => {
+serverless.stderr.on('data', data => {
   console.error(data.toString());
   process.exit(1);
 });
 
-serverless.on("close", (code) => {
+serverless.on('close', code => {
   process.exit(code);
 });