From 083cc0320bd1550b02050a7717489d56480e2b85 Mon Sep 17 00:00:00 2001 From: Yota Hamada Date: Sat, 8 Feb 2025 18:24:44 +0900 Subject: [PATCH] move testdata --- internal/client/client_test.go | 16 ++++++++-------- internal/test/setup.go | 13 ------------- .../client}/empty_status.yaml | 0 .../testdata => testdata/client}/failure.yaml | 0 .../testdata => testdata/client}/grep.yaml | 0 .../client}/invalid_dag.yaml | 0 .../client}/invalid_reqid.yaml | 0 .../testdata => testdata/client}/restart.yaml | 0 .../testdata => testdata/client}/retry.yaml | 0 .../testdata => testdata/client}/run_dag.yaml | 0 .../testdata => testdata/client}/stop.yaml | 0 .../client}/update_status.yaml | 0 .../testdata => testdata/client}/valid.yaml | 0 .../testdata/scheduler/invalid_schedule.yaml | 4 ++++ .../testdata/scheduler/non_scheduled_job.yaml | 3 +++ internal/testdata/scheduler/scheduled_job.yaml | 4 ++++ internal/testdata/scheduler/start.yaml | 3 +++ internal/testdata/scheduler/start_stop.yaml | 6 ++++++ internal/testdata/scheduler/stop.yaml | 3 +++ 19 files changed, 31 insertions(+), 21 deletions(-) rename internal/{client/testdata => testdata/client}/empty_status.yaml (100%) rename internal/{client/testdata => testdata/client}/failure.yaml (100%) rename internal/{client/testdata => testdata/client}/grep.yaml (100%) rename internal/{client/testdata => testdata/client}/invalid_dag.yaml (100%) rename internal/{client/testdata => testdata/client}/invalid_reqid.yaml (100%) rename internal/{client/testdata => testdata/client}/restart.yaml (100%) rename internal/{client/testdata => testdata/client}/retry.yaml (100%) rename internal/{client/testdata => testdata/client}/run_dag.yaml (100%) rename internal/{client/testdata => testdata/client}/stop.yaml (100%) rename internal/{client/testdata => testdata/client}/update_status.yaml (100%) rename internal/{client/testdata => testdata/client}/valid.yaml (100%) create mode 100644 internal/testdata/scheduler/invalid_schedule.yaml create mode 100644 internal/testdata/scheduler/non_scheduled_job.yaml create mode 100644 internal/testdata/scheduler/scheduled_job.yaml create mode 100644 internal/testdata/scheduler/start.yaml create mode 100644 internal/testdata/scheduler/start_stop.yaml create mode 100644 internal/testdata/scheduler/stop.yaml diff --git a/internal/client/client_test.go b/internal/client/client_test.go index 66298abbe..d905fb8a0 100644 --- a/internal/client/client_test.go +++ b/internal/client/client_test.go @@ -24,7 +24,7 @@ func TestClient_GetStatus(t *testing.T) { th := test.Setup(t) t.Run("Valid", func(t *testing.T) { - dag := th.LoadDAGFile(t, "valid.yaml") + dag := th.DAG(t, filepath.Join("client", "valid.yaml")) ctx := th.Context requestID := fmt.Sprintf("request-id-%d", time.Now().Unix()) @@ -67,7 +67,7 @@ func TestClient_GetStatus(t *testing.T) { require.Error(t, dagStatus.Error) }) t.Run("UpdateStatus", func(t *testing.T) { - dag := th.LoadDAGFile(t, "update_status.yaml") + dag := th.DAG(t, filepath.Join("client", "update_status.yaml")) requestID := "test-update-status" now := time.Now() @@ -104,7 +104,7 @@ func TestClient_GetStatus(t *testing.T) { }) t.Run("InvalidUpdateStatusWithInvalidReqID", func(t *testing.T) { wrongReqID := "invalid-request-id" - dag := th.LoadDAGFile(t, "invalid_reqid.yaml") + dag := th.DAG(t, filepath.Join("client", "invalid_reqid.yaml")) ctx := th.Context cli := th.Client @@ -122,7 +122,7 @@ func TestClient_RunDAG(t *testing.T) { th := test.Setup(t) t.Run("RunDAG", func(t *testing.T) { - dag := th.LoadDAGFile(t, "run_dag.yaml") + dag := th.DAG(t, filepath.Join("client", "run_dag.yaml")) dagStatus, err := th.Client.GetStatus(th.Context, dag.Location) require.NoError(t, err) @@ -134,7 +134,7 @@ func TestClient_RunDAG(t *testing.T) { require.Equal(t, scheduler.StatusSuccess.String(), status.Status.String()) }) t.Run("Stop", func(t *testing.T) { - dag := th.LoadDAGFile(t, "stop.yaml") + dag := th.DAG(t, filepath.Join("client", "stop.yaml")) ctx := th.Context th.Client.StartAsync(ctx, dag.DAG, client.StartOptions{}) @@ -147,7 +147,7 @@ func TestClient_RunDAG(t *testing.T) { dag.AssertLatestStatus(t, scheduler.StatusCancel) }) t.Run("Restart", func(t *testing.T) { - dag := th.LoadDAGFile(t, "restart.yaml") + dag := th.DAG(t, filepath.Join("client", "restart.yaml")) ctx := th.Context err := th.Client.Restart(ctx, dag.DAG, client.RestartOptions{}) @@ -156,7 +156,7 @@ func TestClient_RunDAG(t *testing.T) { dag.AssertLatestStatus(t, scheduler.StatusSuccess) }) t.Run("Retry", func(t *testing.T) { - dag := th.LoadDAGFile(t, "retry.yaml") + dag := th.DAG(t, filepath.Join("client", "retry.yaml")) ctx := th.Context cli := th.Client @@ -285,7 +285,7 @@ func TestClient_ReadHistory(t *testing.T) { t.Run("TestClient_Empty", func(t *testing.T) { ctx := th.Context cli := th.Client - dag := th.LoadDAGFile(t, "empty_status.yaml") + dag := th.DAG(t, filepath.Join("client", "empty_status.yaml")) _, err := cli.GetStatus(ctx, dag.Location) require.NoError(t, err) diff --git a/internal/test/setup.go b/internal/test/setup.go index e9426adf6..67fc6799a 100644 --- a/internal/test/setup.go +++ b/internal/test/setup.go @@ -122,19 +122,6 @@ func (h Helper) Cleanup() { _ = os.RemoveAll(h.tmpDir) } -func (h Helper) LoadDAGFile(t *testing.T, filename string) DAG { - t.Helper() - - filePath := filepath.Join(fileutil.MustGetwd(), "testdata", filename) - dag, err := digraph.Load(h.Context, filePath) - require.NoError(t, err) - - return DAG{ - Helper: &h, - DAG: dag, - } -} - // DAG loads a test DAG from the testdata directory func (h Helper) DAG(t *testing.T, name string) DAG { t.Helper() diff --git a/internal/client/testdata/empty_status.yaml b/internal/testdata/client/empty_status.yaml similarity index 100% rename from internal/client/testdata/empty_status.yaml rename to internal/testdata/client/empty_status.yaml diff --git a/internal/client/testdata/failure.yaml b/internal/testdata/client/failure.yaml similarity index 100% rename from internal/client/testdata/failure.yaml rename to internal/testdata/client/failure.yaml diff --git a/internal/client/testdata/grep.yaml b/internal/testdata/client/grep.yaml similarity index 100% rename from internal/client/testdata/grep.yaml rename to internal/testdata/client/grep.yaml diff --git a/internal/client/testdata/invalid_dag.yaml b/internal/testdata/client/invalid_dag.yaml similarity index 100% rename from internal/client/testdata/invalid_dag.yaml rename to internal/testdata/client/invalid_dag.yaml diff --git a/internal/client/testdata/invalid_reqid.yaml b/internal/testdata/client/invalid_reqid.yaml similarity index 100% rename from internal/client/testdata/invalid_reqid.yaml rename to internal/testdata/client/invalid_reqid.yaml diff --git a/internal/client/testdata/restart.yaml b/internal/testdata/client/restart.yaml similarity index 100% rename from internal/client/testdata/restart.yaml rename to internal/testdata/client/restart.yaml diff --git a/internal/client/testdata/retry.yaml b/internal/testdata/client/retry.yaml similarity index 100% rename from internal/client/testdata/retry.yaml rename to internal/testdata/client/retry.yaml diff --git a/internal/client/testdata/run_dag.yaml b/internal/testdata/client/run_dag.yaml similarity index 100% rename from internal/client/testdata/run_dag.yaml rename to internal/testdata/client/run_dag.yaml diff --git a/internal/client/testdata/stop.yaml b/internal/testdata/client/stop.yaml similarity index 100% rename from internal/client/testdata/stop.yaml rename to internal/testdata/client/stop.yaml diff --git a/internal/client/testdata/update_status.yaml b/internal/testdata/client/update_status.yaml similarity index 100% rename from internal/client/testdata/update_status.yaml rename to internal/testdata/client/update_status.yaml diff --git a/internal/client/testdata/valid.yaml b/internal/testdata/client/valid.yaml similarity index 100% rename from internal/client/testdata/valid.yaml rename to internal/testdata/client/valid.yaml diff --git a/internal/testdata/scheduler/invalid_schedule.yaml b/internal/testdata/scheduler/invalid_schedule.yaml new file mode 100644 index 000000000..01388b68b --- /dev/null +++ b/internal/testdata/scheduler/invalid_schedule.yaml @@ -0,0 +1,4 @@ +schedule: invalid schedule * * * +steps: + - name: step 1 + command: "true" \ No newline at end of file diff --git a/internal/testdata/scheduler/non_scheduled_job.yaml b/internal/testdata/scheduler/non_scheduled_job.yaml new file mode 100644 index 000000000..ab3321285 --- /dev/null +++ b/internal/testdata/scheduler/non_scheduled_job.yaml @@ -0,0 +1,3 @@ +steps: + - name: step 1 + command: "true" \ No newline at end of file diff --git a/internal/testdata/scheduler/scheduled_job.yaml b/internal/testdata/scheduler/scheduled_job.yaml new file mode 100644 index 000000000..3313e5723 --- /dev/null +++ b/internal/testdata/scheduler/scheduled_job.yaml @@ -0,0 +1,4 @@ +schedule: 0 * * * * +steps: + - name: step 1 + command: "true" \ No newline at end of file diff --git a/internal/testdata/scheduler/start.yaml b/internal/testdata/scheduler/start.yaml new file mode 100644 index 000000000..90c67a1e9 --- /dev/null +++ b/internal/testdata/scheduler/start.yaml @@ -0,0 +1,3 @@ +steps: + - name: "1" + command: "sleep 1" \ No newline at end of file diff --git a/internal/testdata/scheduler/start_stop.yaml b/internal/testdata/scheduler/start_stop.yaml new file mode 100644 index 000000000..fde2ed4af --- /dev/null +++ b/internal/testdata/scheduler/start_stop.yaml @@ -0,0 +1,6 @@ +schedule: + start: "0 * * * *" + stop: "1 * * * *" +steps: + - name: step 1 + command: "sleep 100" \ No newline at end of file diff --git a/internal/testdata/scheduler/stop.yaml b/internal/testdata/scheduler/stop.yaml new file mode 100644 index 000000000..90c67a1e9 --- /dev/null +++ b/internal/testdata/scheduler/stop.yaml @@ -0,0 +1,3 @@ +steps: + - name: "1" + command: "sleep 1" \ No newline at end of file