increase coverage of wml by extracting auth

cloud-annotations · Apr 3, 2019 · 541b2e1 · 541b2e1
1 parent e36b241
commit 541b2e1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/__tests__/api/wml.test.js b/__tests__/api/wml.test.js
diff --git a/__tests__/commands/train.test.js b/__tests__/commands/train.test.js
@@ -26,6 +26,19 @@ describe('train', () => {
     return promise
   })
 
+  it('trains with a zip', async () => {
+    const promise = train([
+      '__tests__/fake.zip',
+      '--config',
+      '__tests__/config.yaml'
+    ])
+    await wait()
+    await wait()
+    io.send('no')
+    io.send(keys.enter)
+    return promise
+  })
+
   it('watches progress', async () => {
     const promise = train(['--config', '__tests__/config.yaml'])
     // Need to wait twice for some reason...

diff --git a/__tests__/fake.zip b/__tests__/fake.zip
diff --git a/src/api/wml.js b/src/api/wml.js
@@ -36,7 +36,13 @@ class WML {
   }
 
   async authenticate() {
-    return api.authenticate(this._url, this._username, this._password)
+    if (!this._token) {
+      this._token = await api.authenticate(
+        this._url,
+        this._username,
+        this._password
+      )
+    }
   }
 
   async startTraining(trainingScript) {
@@ -47,30 +53,22 @@ class WML {
   }
 
   async createMonitorSocket(modelId) {
-    if (!this._token) {
-      this._token = await this.authenticate()
-    }
+    await this.authenticate()
     return api.socket(this._url, this._token, modelId)
   }
 
   async getTrainingRun(modelId) {
-    if (!this._token) {
-      this._token = await this.authenticate()
-    }
+    await this.authenticate()
     return api.getModel(this._url, this._token, modelId)
   }
 
   async listTrainingRuns() {
-    if (!this._token) {
-      this._token = await this.authenticate()
-    }
+    await this.authenticate()
     return api.getModels(this._url, this._token)
   }
 
   async createTrainingDefinition() {
-    if (!this._token) {
-      this._token = await this.authenticate()
-    }
+    await this.authenticate()
     // Deep copy.
     const trainingDefinition = JSON.parse(
       JSON.stringify(DEFAULT_TRAINING_DEFINITION)
@@ -84,9 +82,7 @@ class WML {
   }
 
   async addTrainingScript(trainingDefinition, trainingScript) {
-    if (!this._token) {
-      this._token = await this.authenticate()
-    }
+    await this.authenticate()
 
     const trainingZip = (() => {
       if (trainingScript) {
@@ -105,9 +101,7 @@ class WML {
   }
 
   async startTrainingRun(trainingDefinition) {
-    if (!this._token) {
-      this._token = await this.authenticate()
-    }
+    await this.authenticate()
 
     const steps = safeGet(() => this._trainingParams.steps) || DEFAULT_STEPS
     const gpu = safeGet(() => this._trainingParams.gpu) || DEFAULT_GPU