test: refactored test-http-allow-req-after-204-res to countdown

mithunsasidharan · gibfahn · commit 50bd4b030e09 · 2017-12-20T00:10:53.000Z
PR-URL: #17211 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
diff --git a/test/common/countdown.js b/test/common/countdown.js
@@ -17,6 +17,7 @@ class Countdown {
     assert(this[kLimit] > 0, 'Countdown expired');
     if (--this[kLimit] === 0)
       this[kCallback]();
+    return this[kLimit];
   }
 
   get remaining() {
diff --git a/test/parallel/test-http-allow-req-after-204-res.js b/test/parallel/test-http-allow-req-after-204-res.js
@@ -23,12 +23,12 @@
 const common = require('../common');
 const http = require('http');
 const assert = require('assert');
+const Countdown = require('../common/countdown');
 
 // first 204 or 304 works, subsequent anything fails
 const codes = [204, 200];
 
-// Methods don't really matter, but we put in something realistic.
-const methods = ['DELETE', 'DELETE'];
+const countdown = new Countdown(codes.length, () => server.close());
 
 const server = http.createServer(common.mustCall((req, res) => {
   const code = codes.shift();
@@ -39,17 +39,13 @@ const server = http.createServer(common.mustCall((req, res) => {
 }, codes.length));
 
 function nextRequest() {
-  const method = methods.shift();
 
-  const request = http.request({
+  const request = http.get({
     port: server.address().port,
-    method: method,
     path: '/'
   }, common.mustCall((response) => {
     response.on('end', common.mustCall(() => {
-      if (methods.length === 0) {
-        server.close();
-      } else {
+      if (countdown.dec()) {
         // throws error:
         nextRequest();
         // works just fine:

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ class Countdown {`
`17`	`17`	`assert(this[kLimit] > 0, 'Countdown expired');`
`18`	`18`	`if (--this[kLimit] === 0)`
`19`	`19`	`this[kCallback]();`
	`20`	`+ return this[kLimit];`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`get remaining() {`