more tests / no retry policy

Clever · Nov 4, 2016 · 3e5d27b · 3e5d27b
1 parent 58eee55
commit 3e5d27b
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 4 deletions.
diff --git a/samples/gen-js/index.js b/samples/gen-js/index.js
@@ -35,6 +35,15 @@ const defaultRetryPolicy = {
   },
 };
 
+const noRetryPolicy = {
+  backoffs() {
+    return [];
+  },
+  retry(requestOptions, err, res, body) {
+    return false;
+  },
+};
+
 module.exports = class SwaggerTest {
 
   constructor(options) {
@@ -113,7 +122,7 @@ module.exports = class SwaggerTest {
         }
       }
 
-      const retryPolicy = this.retryPolicy || options.retryPolicy || defaultRetryPolicy;
+      const retryPolicy = options.retryPolicy || this.retryPolicy || defaultRetryPolicy;
       const backoffs = retryPolicy.backoffs();
       let retries = 0;
       (function requestOnce() {
@@ -379,4 +388,5 @@ module.exports = class SwaggerTest {
 
 module.exports.RetryPolicies = {
   Default: defaultRetryPolicy,
+  No: noRetryPolicy,
 };
diff --git a/samples/gen-js/test/test.js b/samples/gen-js/test/test.js
@@ -3,13 +3,16 @@ const nock = require("nock");
 const util = require("util");
 
 const Client = require("../index");
+const {RetryPolicies} = Client;
+
+const mockAddress = "http://localhost:8000";
 
 describe("retries", function() {
-  it("exponential backoff by default", function(done) {
-    const client = new Client({address: "http://localhost:8000"});
+  it("performs exponential backoff by default", function(done) {
+    const client = new Client({address: mockAddress});
     let requestCount = 0;
     let requestTimes = [];
-    const scope = nock("http://localhost:8000")
+    const scope = nock(mockAddress)
             .get("/v1/books")
             .times(3)
             .reply(function(uri, requestBody) {
@@ -32,4 +35,58 @@ describe("retries", function() {
       done();
     });
   });
+
+  it("lets the user configure a custom retry policy on the client", function(done) {
+    const client = new Client({
+      address: mockAddress,
+      retryPolicy: RetryPolicies.No
+    });
+    let requestCount = 0;
+    let requestTimes = [];
+    const scope = nock(mockAddress)
+            .get("/v1/books")
+            .times(3)
+            .reply(function(uri, requestBody) {
+              requestTimes.push(new Date());
+              requestCount++;
+              if (requestCount <= 2) {
+                return [500, ""];
+              } else {
+                return [200, "[]"];
+              }
+            });
+    client.getBooks({}, function(err, books) {
+      assert.equal(requestCount, 1);
+      assert(err);
+      assert(!scope.isDone());
+      nock.cleanAll();
+      done();
+    });
+  });
+
+  it("lets the user configure a custom retry policy on a single request", function(done) {
+    const client = new Client({address: mockAddress});
+    let requestCount = 0;
+    let requestTimes = [];
+    const scope = nock(mockAddress)
+            .get("/v1/books")
+            .times(3)
+            .reply(function(uri, requestBody) {
+              requestTimes.push(new Date());
+              requestCount++;
+              if (requestCount <= 2) {
+                return [500, ""];
+              } else {
+                return [200, "[]"];
+              }
+            });
+    client.getBooks({}, {retryPolicy: RetryPolicies.No}, function(err, books) {
+      assert.equal(requestCount, 1);
+      assert(err);
+      assert(!scope.isDone());
+      nock.cleanAll();
+      done();
+    });
+  });
+
 });