fix all integration tests

iterative · Apr 12, 2023 · cdd871a · cdd871a
1 parent e8415a0
commit cdd871a
Show file tree

Hide file tree

Showing 59 changed files with 13,705 additions and 14,072 deletions.
diff --git a/extension/src/cli/dvc/viewer.ts b/extension/src/cli/dvc/viewer.ts
@@ -51,13 +51,13 @@ export class DvcViewer extends Disposable implements ICli {
     return this.createProcess(name, cwd, args)
   }
 
-  public queueLogs(cwd: string, expName: string) {
+  public queueLogs(cwd: string, id: string) {
     return this.run(
-      `${expName} logs`,
+      `${id} logs`,
       cwd,
       Command.QUEUE,
       QueueSubCommand.LOGS,
-      expName,
+      id,
       Flag.FOLLOW
     )
   }

diff --git a/extension/src/experiments/columns/collect/index.test.ts b/extension/src/experiments/columns/collect/index.test.ts
@@ -1,10 +1,14 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
-import { join } from 'path'
-import { collectChanges, collectColumns } from '.'
+import {
+  collectChanges,
+  collectChanges_,
+  collectColumns,
+  collectColumns_
+} from '.'
 import { timestampColumn } from '../constants'
-import { buildDepPath, buildMetricOrParamPath } from '../paths'
+import { buildMetricOrParamPath } from '../paths'
 import { Column, ColumnType } from '../../webview/contract'
-import outputFixture from '../../../test/fixtures/expShow/base/output'
+import outputFixture from '../../../test/fixtures/expShow/base/output_'
 import columnsFixture from '../../../test/fixtures/expShow/base/columns'
 import workspaceChangesFixture from '../../../test/fixtures/expShow/base/workspaceChanges'
 import uncommittedDepsFixture from '../../../test/fixtures/expShow/uncommittedDeps/output'
@@ -23,7 +27,7 @@ mockedGetConfigValue.mockImplementation(() => 5)
 
 describe('collectColumns', () => {
   it('should return a value equal to the columns fixture when given the output fixture', () => {
-    const columns = collectColumns(outputFixture)
+    const columns = collectColumns_(outputFixture)
     expect(columns).toStrictEqual(columnsFixture)
   })
 
@@ -429,70 +433,6 @@ describe('collectColumns', () => {
 
     expect(onlyHasPrimitiveChild).toBeUndefined()
   })
-
-  it('should collect all params and metrics from the test fixture', () => {
-    expect(collectColumns(outputFixture).map(({ path }) => path)).toStrictEqual(
-      [
-        timestampColumn.path,
-        buildMetricOrParamPath(ColumnType.METRICS, 'summary.json'),
-        buildMetricOrParamPath(ColumnType.METRICS, 'summary.json', 'loss'),
-        buildMetricOrParamPath(ColumnType.METRICS, 'summary.json', 'accuracy'),
-        buildMetricOrParamPath(ColumnType.METRICS, 'summary.json', 'val_loss'),
-        buildMetricOrParamPath(
-          ColumnType.METRICS,
-          'summary.json',
-          'val_accuracy'
-        ),
-        buildMetricOrParamPath(ColumnType.PARAMS, 'params.yaml'),
-        buildMetricOrParamPath(ColumnType.PARAMS, 'params.yaml', 'code_names'),
-        buildMetricOrParamPath(ColumnType.PARAMS, 'params.yaml', 'epochs'),
-        buildMetricOrParamPath(
-          ColumnType.PARAMS,
-          'params.yaml',
-          'learning_rate'
-        ),
-        buildMetricOrParamPath(
-          ColumnType.PARAMS,
-          'params.yaml',
-          'dvc_logs_dir'
-        ),
-        buildMetricOrParamPath(ColumnType.PARAMS, 'params.yaml', 'log_file'),
-        buildMetricOrParamPath(ColumnType.PARAMS, 'params.yaml', 'dropout'),
-        buildMetricOrParamPath(ColumnType.PARAMS, 'params.yaml', 'process'),
-        buildMetricOrParamPath(
-          ColumnType.PARAMS,
-          'params.yaml',
-          'process',
-          'threshold'
-        ),
-        buildMetricOrParamPath(
-          ColumnType.PARAMS,
-          'params.yaml',
-          'process',
-          'test_arg'
-        ),
-        buildMetricOrParamPath(
-          ColumnType.PARAMS,
-          join('nested', 'params.yaml')
-        ),
-        buildMetricOrParamPath(
-          ColumnType.PARAMS,
-          join('nested', 'params.yaml'),
-          'test'
-        ),
-        buildDepPath('data'),
-        buildDepPath('data', 'data.xml'),
-        buildDepPath('src'),
-        buildDepPath('src', 'prepare.py'),
-        buildDepPath('data', 'prepared'),
-        buildDepPath('src', 'featurization.py'),
-        buildDepPath('data', 'features'),
-        buildDepPath('src', 'train.py'),
-        buildDepPath('model.pkl'),
-        buildDepPath('src', 'evaluate.py')
-      ]
-    )
-  })
 })
 
 describe('collectChanges', () => {
@@ -523,7 +463,7 @@ describe('collectChanges', () => {
   })
 
   it('should return the expected data from the output fixture', () => {
-    const changes = collectChanges(outputFixture)
+    const changes = collectChanges_(outputFixture)
     expect(changes).toStrictEqual(workspaceChangesFixture)
   })
 

diff --git a/extension/src/experiments/columns/collect/index.ts b/extension/src/experiments/columns/collect/index.ts
@@ -120,12 +120,16 @@ export const getData_ = (expState: ExpState): ExpStateData | undefined => {
   if (hasError(expState)) {
     return
   }
-  return expState?.data
+  return expState.data
 }
 
 export const collectChanges_ = (output: ExpShowOutput): string[] => {
   const changes: string[] = []
 
+  if (!(output.length > 1)) {
+    return changes
+  }
+
   const [workspaceData, currentCommitData] = output
   const workspace = getData_(workspaceData)
   const currentCommit = getData_(currentCommitData)

diff --git a/extension/src/experiments/columns/model.test.ts b/extension/src/experiments/columns/model.test.ts
@@ -6,7 +6,7 @@ import { buildMockMemento } from '../../test/util'
 import { Status } from '../../path/selection/model'
 import { PersistenceKey } from '../../persistence/constants'
 import { ColumnType } from '../webview/contract'
-import outputFixture from '../../test/fixtures/expShow/base/output'
+import outputFixture from '../../test/fixtures/expShow/base/output_'
 import columnsFixture from '../../test/fixtures/expShow/base/columns'
 import {
   deeplyNestedColumnsWithHeightOf10,
@@ -64,7 +64,7 @@ describe('ColumnsModel', () => {
       buildMockMemento(),
       mockedColumnsOrderOrStatusChanged
     )
-    await model.transformAndSet(outputFixture)
+    await model.transformAndSet_(outputFixture)
     expect(mockedGetConfigValue).toHaveBeenCalled()
     expect(model.getSelected()).toStrictEqual(columnsFixture)
   })
@@ -284,7 +284,7 @@ describe('ColumnsModel', () => {
         }),
         mockedColumnsOrderOrStatusChanged
       )
-      await model.transformAndSet(outputFixture)
+      await model.transformAndSet_(outputFixture)
 
       expect(model.getFirstThreeColumnOrder()).toStrictEqual(
         persistedState.slice(1, 4)
@@ -303,7 +303,7 @@ describe('ColumnsModel', () => {
         buildMockMemento(),
         mockedColumnsOrderOrStatusChanged
       )
-      await model.transformAndSet(outputFixture)
+      await model.transformAndSet_(outputFixture)
 
       expect(model.getFirstThreeColumnOrder()).toStrictEqual([
         'Created',
@@ -398,7 +398,7 @@ describe('ColumnsModel', () => {
         mockMemento,
         mockedColumnsOrderOrStatusChanged
       )
-      await model.transformAndSet(outputFixture)
+      await model.transformAndSet_(outputFixture)
       expect(model.getSelected()).toStrictEqual(columnsFixture)
 
       const parentPath = 'params:params.yaml:process'
@@ -419,7 +419,7 @@ describe('ColumnsModel', () => {
         mockMemento,
         mockedColumnsOrderOrStatusChanged
       )
-      await model.transformAndSet(outputFixture)
+      await model.transformAndSet_(outputFixture)
       expect(model.getSelected()).not.toStrictEqual(columnsFixture)
 
       model.toggleStatus(parentPath)
@@ -437,7 +437,7 @@ describe('ColumnsModel', () => {
         mockMemento,
         mockedColumnsOrderOrStatusChanged
       )
-      await model.transformAndSet(outputFixture)
+      await model.transformAndSet_(outputFixture)
       expect(model.getSelected()).toStrictEqual(columnsFixture)
 
       const parentPath = 'metrics:summary.json'

diff --git a/extension/src/experiments/columns/model.ts b/extension/src/experiments/columns/model.ts
@@ -1,6 +1,5 @@
 import { EventEmitter, Memento } from 'vscode'
 import {
-  collectChanges,
   collectChanges_,
   collectColumns,
   collectColumns_,
@@ -60,10 +59,7 @@ export class ColumnsModel extends PathSelectionModel<Column> {
   }
 
   public transformAndSet(data: ExperimentsOutput) {
-    return Promise.all([
-      this.transformAndSetColumns(data),
-      this.transformAndSetChanges(data)
-    ])
+    return Promise.all([this.transformAndSetColumns(data)])
   }
 
   public transformAndSet_(data: ExpShowOutput) {
@@ -201,10 +197,6 @@ export class ColumnsModel extends PathSelectionModel<Column> {
     this.paramsFiles = paramsFiles
   }
 
-  private transformAndSetChanges(data: ExperimentsOutput) {
-    this.columnsChanges = collectChanges(data)
-  }
-
   private transformAndSetChanges_(data: ExpShowOutput) {
     this.columnsChanges = collectChanges_(data)
   }

diff --git a/extension/src/experiments/commands/register.ts b/extension/src/experiments/commands/register.ts
@@ -130,11 +130,7 @@ const registerExperimentNameCommands = (
   internalCommands.registerExternalCliCommand(
     RegisteredCliCommands.EXPERIMENT_VIEW_APPLY,
     ({ dvcRoot, id }: ExperimentDetails) =>
-      experiments.getExpNameThenRun(
-        AvailableCommands.EXPERIMENT_APPLY,
-        dvcRoot,
-        id
-      )
+      experiments.runCommand(AvailableCommands.EXPERIMENT_APPLY, dvcRoot, id)
   )
 
   internalCommands.registerExternalCliCommand(
@@ -164,7 +160,7 @@ const registerExperimentInputCommands = (
   internalCommands.registerExternalCliCommand(
     RegisteredCliCommands.EXPERIMENT_VIEW_BRANCH,
     ({ dvcRoot, id }: ExperimentDetails) =>
-      experiments.getExpNameAndInputThenRun(
+      experiments.getInputAndRun(
         getBranchExperimentCommand(experiments),
         Title.ENTER_BRANCH_NAME,
         dvcRoot,
@@ -184,7 +180,7 @@ const registerExperimentInputCommands = (
   internalCommands.registerExternalCliCommand(
     RegisteredCliCommands.EXPERIMENT_VIEW_SHARE_AS_BRANCH,
     ({ dvcRoot, id }: ExperimentDetails) =>
-      experiments.getExpNameAndInputThenRun(
+      experiments.getInputAndRun(
         getShareExperimentAsBranchCommand(internalCommands),
         Title.ENTER_BRANCH_NAME,
         dvcRoot,
@@ -204,7 +200,7 @@ const registerExperimentInputCommands = (
   internalCommands.registerExternalCliCommand(
     RegisteredCliCommands.EXPERIMENT_VIEW_SHARE_AS_COMMIT,
     ({ dvcRoot, id }: ExperimentDetails) =>
-      experiments.getExpNameAndInputThenRun(
+      experiments.getInputAndRun(
         getShareExperimentAsCommitCommand(internalCommands),
         Title.ENTER_COMMIT_MESSAGE,
         dvcRoot,

diff --git a/extension/src/experiments/data/collect.ts b/extension/src/experiments/data/collect.ts
@@ -6,6 +6,10 @@ export const collectFiles = (
   output: ExpShowOutput,
   existingFiles: string[]
 ): string[] => {
+  if (!output?.length) {
+    return existingFiles
+  }
+
   const [workspace] = output
 
   const data = getData_(workspace)