Merge pull request #2337 from uProxy/trevj-remove-cloud-install-retry

remove cloud install retry since the installer module now does it

Author: trevj

src/generic_core/uproxy_core.spec.ts

@@ -110,48 +110,3 @@ describe('Core', () => {
     }).then(done);
   });
 });
-
-describe('retry', () => {
-  var MAX_ATTEMPTS = 5;
-  var RETURN_VALUE = 'hello';
-
-  it('only calls successful func once', (done) => {
-    var spyFunc = jasmine.createSpy('spyFunc');
-    spyFunc.and.returnValue(Promise.resolve(RETURN_VALUE));
-    uproxy_core.retry(spyFunc, MAX_ATTEMPTS).then((x :any) => {
-      expect(spyFunc.calls.count()).toEqual(1);
-      expect(x).toEqual(RETURN_VALUE);
-      done();
-    });
-  });
-
-  it('calls func multiple times until success', (done) => {
-    var spyFunc = jasmine.createSpy('spyFunc');
-    var callCount = 0;
-    var NUM_CALLS_BEFORE_SUCCESS = 3;
-    expect(NUM_CALLS_BEFORE_SUCCESS).toBeLessThan(MAX_ATTEMPTS);
-    spyFunc.and.callFake(() => {
-      if (++callCount === NUM_CALLS_BEFORE_SUCCESS) {
-        return Promise.resolve(RETURN_VALUE);
-      } else {
-        return Promise.reject('error');
-      }
-    });
-    uproxy_core.retry(spyFunc, MAX_ATTEMPTS).then((x :any) => {
-      expect(spyFunc.calls.count()).toEqual(NUM_CALLS_BEFORE_SUCCESS);
-      expect(x).toEqual(RETURN_VALUE);
-      done();
-    });
-  });
-
-  it('stops calling failing func after the max number of tries', (done) => {
-    var RETURN_VALUE = 'hello';
-    var spyFunc = jasmine.createSpy('spyFunc');
-    spyFunc.and.returnValue(Promise.reject(RETURN_VALUE));
-    uproxy_core.retry(spyFunc, MAX_ATTEMPTS).catch((x :any) => {
-      expect(spyFunc.calls.count()).toEqual(MAX_ATTEMPTS);
-      expect(x).toEqual(RETURN_VALUE);
-      done();
-    });
-  });
-});

src/generic_core/uproxy_core.ts

@@ -667,15 +667,8 @@ export class uProxyCore implements uproxy_core_api.CoreApi {
                 DEPLOY_PROGRESS + (progress * ((100 - DEPLOY_PROGRESS) / 100)));
           });
 
-          // Attempt to install.  If install fails, retry will attempt again
-          // up to MAX_INSTALLS times.  Failure may occur because we have just
-          // created the server and it is not yet ready for SSH.
           // TODO: The provisioning module should return the username!
-          const install = () => {
-            return installer.install(host, port, 'root', serverInfo.ssh.private);
-          };
-          const MAX_INSTALLS = 5;
-          return retry(install, MAX_INSTALLS);
+          return installer.install(host, port, 'root', serverInfo.ssh.private);
         }).then((cloudNetworkData: any) => {
           // TODO: make cloudNetworkData an Invite type.  This requires the cloud
           // social provider to export the Invite interface, and also to cleanup
@@ -792,16 +785,3 @@ export class uProxyCore implements uproxy_core_api.CoreApi {
     return Promise.resolve<void>();
   }
 }  // class uProxyCore
-
-// Invoke an async function, and retry on error, calling func up to
-// maxAttempts number of times.
-export var retry = <T>(func :() => Promise<T>, maxAttempts :number) : Promise<T> => {
-  return func().catch((err) => {
-    --maxAttempts;
-    if (maxAttempts > 0) {
-      return retry(func, maxAttempts);
-    } else {
-      return Promise.reject(err)
-    }
-  });
-}