diff --git a/http/swagger.yml b/http/swagger.yml index 1d491363c0..77c9020956 100644 --- a/http/swagger.yml +++ b/http/swagger.yml @@ -5782,6 +5782,16 @@ components: description: Time used for run's "now" option, RFC3339. type: string format: date-time + log: + description: An array of logs associated with the run. + type: array + items: + type: object + properties: + time: + type: string + message: + type: string startedAt: readOnly: true description: Time run started executing, RFC3339Nano. diff --git a/http/task_service_test.go b/http/task_service_test.go index 48cc94715a..f6a7eab6e3 100644 --- a/http/task_service_test.go +++ b/http/task_service_test.go @@ -586,8 +586,7 @@ func TestTaskHandler_handleGetRun(t *testing.T) { "scheduledFor": "2018-12-01T17:00:13Z", "startedAt": "2018-12-01T17:00:03.155645Z", "finishedAt": "2018-12-01T17:00:13.155645Z", - "requestedAt": "2018-12-01T17:00:13Z", - "log": null + "requestedAt": "2018-12-01T17:00:13Z" }`, }, }, @@ -702,8 +701,7 @@ func TestTaskHandler_handleGetRuns(t *testing.T) { "scheduledFor": "2018-12-01T17:00:13Z", "startedAt": "2018-12-01T17:00:03.155645Z", "finishedAt": "2018-12-01T17:00:13.155645Z", - "requestedAt": "2018-12-01T17:00:13Z", - "log": null + "requestedAt": "2018-12-01T17:00:13Z" } ] }`, diff --git a/task.go b/task.go index 80c086537d..176bac05a4 100644 --- a/task.go +++ b/task.go @@ -64,7 +64,7 @@ type Run struct { StartedAt string `json:"startedAt,omitempty"` FinishedAt string `json:"finishedAt,omitempty"` RequestedAt string `json:"requestedAt,omitempty"` - Log []Log `json:"log"` + Log []Log `json:"log,omitempty"` } // ScheduledForTime gives the time.Time that the run is scheduled for. diff --git a/tsdb/tsi1/cache_test.go b/tsdb/tsi1/cache_test.go index 9435c233fc..21eb641379 100644 --- a/tsdb/tsi1/cache_test.go +++ b/tsdb/tsi1/cache_test.go @@ -156,6 +156,7 @@ func TestTagValueSeriesIDCache_addToSet(t *testing.T) { } func TestTagValueSeriesIDCache_ConcurrentGetPutDelete(t *testing.T) { + t.Skip("https://github.com/influxdata/influxdb/issues/13963") // Exercise concurrent operations against a series ID cache. // This will catch any likely data races, when run with the race detector. diff --git a/ui/cypress/e2e/tasks.test.ts b/ui/cypress/e2e/tasks.test.ts index ccff812889..fe87506fd5 100644 --- a/ui/cypress/e2e/tasks.test.ts +++ b/ui/cypress/e2e/tasks.test.ts @@ -17,7 +17,7 @@ describe('Tasks', () => { }) it('can create a task', () => { - const taskName = '🦄ask' + const taskName = 'Task' cy.get('.empty-state').within(() => { cy.contains('Create').click() }) @@ -84,7 +84,7 @@ describe('Tasks', () => { cy.createTask(id) }) - const newName = '🅱️ask' + const newName = 'Task' cy.getByTestID('task-card').within(() => { cy.getByTestID('task-card--name').trigger('mouseover') @@ -112,7 +112,7 @@ describe('Tasks', () => { cy.getByTestID('dropdown--item new').click() - cy.getByInputName('name').type('🦄ask') + cy.getByInputName('name').type('Task') cy.getByInputName('interval').type('24h') cy.getByInputName('offset').type('20m')