Fix flakey job test (#10807)

smartcontractkit · Sep 27, 2023 · 6b1d465 · 6b1d465
1 parent 05efa5d
commit 6b1d465
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 21 deletions.
diff --git a/core/cmd/jobs_commands_test.go b/core/cmd/jobs_commands_test.go
@@ -3,9 +3,11 @@ package cmd_test
 import (
 	"bytes"
 	"flag"
+	"fmt"
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli"
@@ -293,6 +295,26 @@ func TestJob_ToRows(t *testing.T) {
 	}, job.ToRows())
 }
 
+const directRequestSpecTemplate = `
+type                = "directrequest"
+schemaVersion       = 1
+evmChainID          = "0"
+name                = "example eth request event spec"
+contractAddress     = "0x613a38AC1659769640aaE063C651F48E0250454C"
+externalJobID       = "%s"
+observationSource   = """
+    ds1          [type=http method=GET url="http://example.com" allowunrestrictednetworkaccess="true"];
+    ds1_merge    [type=merge left="{}"]
+    ds1_parse    [type=jsonparse path="USD"];
+    ds1_multiply [type=multiply times=100];
+    ds1 -> ds1_parse -> ds1_multiply;
+"""
+`
+
+func getDirectRequestSpec() string {
+	return fmt.Sprintf(directRequestSpecTemplate, uuid.New())
+}
+
 func TestShell_ListFindJobs(t *testing.T) {
 	t.Parallel()
 
@@ -305,7 +327,7 @@ func TestShell_ListFindJobs(t *testing.T) {
 	fs := flag.NewFlagSet("", flag.ExitOnError)
 	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
 
-	require.NoError(t, fs.Parse([]string{"../testdata/tomlspecs/direct-request-spec.toml"}))
+	require.NoError(t, fs.Parse([]string{getDirectRequestSpec()}))
 
 	err := client.CreateJob(cli.NewContext(nil, fs, nil))
 	require.NoError(t, err)
@@ -331,7 +353,7 @@ func TestShell_ShowJob(t *testing.T) {
 	fs := flag.NewFlagSet("", flag.ExitOnError)
 	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
 
-	require.NoError(t, fs.Parse([]string{"../testdata/tomlspecs/direct-request-spec.toml"}))
+	require.NoError(t, fs.Parse([]string{getDirectRequestSpec()}))
 
 	err := client.CreateJob(cli.NewContext(nil, fs, nil))
 	require.NoError(t, err)
@@ -400,7 +422,7 @@ func TestShell_DeleteJob(t *testing.T) {
 	fs := flag.NewFlagSet("", flag.ExitOnError)
 	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
 
-	require.NoError(t, fs.Parse([]string{"../testdata/tomlspecs/direct-request-spec.toml"}))
+	require.NoError(t, fs.Parse([]string{getDirectRequestSpec()}))
 
 	err := client.CreateJob(cli.NewContext(nil, fs, nil))
 	require.NoError(t, err)

diff --git a/core/services/job/job_orm_test.go b/core/services/job/job_orm_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 	"github.com/lib/pq"
-	"github.com/pelletier/go-toml"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
@@ -217,9 +216,23 @@ func TestORM(t *testing.T) {
 	})
 
 	t.Run("creates a job with a direct request spec", func(t *testing.T) {
-		tree, err := toml.LoadFile("../../testdata/tomlspecs/direct-request-spec.toml")
-		require.NoError(t, err)
-		jb, err := directrequest.ValidatedDirectRequestSpec(tree.String())
+		drSpec := fmt.Sprintf(`
+		type                = "directrequest"
+		schemaVersion       = 1
+		evmChainID          = "0"
+		name                = "example eth request event spec"
+		contractAddress     = "0x613a38AC1659769640aaE063C651F48E0250454C"
+		externalJobID       = "%s"
+		observationSource   = """
+		    ds1          [type=http method=GET url="http://example.com" allowunrestrictednetworkaccess="true"];
+		    ds1_merge    [type=merge left="{}"]
+		    ds1_parse    [type=jsonparse path="USD"];
+		    ds1_multiply [type=multiply times=100];
+		    ds1 -> ds1_parse -> ds1_multiply;
+		"""
+		`, uuid.New())
+
+		jb, err := directrequest.ValidatedDirectRequestSpec(drSpec)
 		require.NoError(t, err)
 		err = orm.CreateJob(&jb)
 		require.NoError(t, err)

diff --git a/core/testdata/tomlspecs/direct-request-spec.toml b/core/testdata/tomlspecs/direct-request-spec.toml
diff --git a/core/web/jobs_controller_test.go b/core/web/jobs_controller_test.go
@@ -670,7 +670,23 @@ func setupJobSpecsControllerTestsWithJobs(t *testing.T) (*cltest.TestApplication
 	err = app.AddJobV2(testutils.Context(t), &jb)
 	require.NoError(t, err)
 
-	erejb, err := directrequest.ValidatedDirectRequestSpec(string(cltest.MustReadFile(t, "../testdata/tomlspecs/direct-request-spec.toml")))
+	drSpec := fmt.Sprintf(`
+		type                = "directrequest"
+		schemaVersion       = 1
+		evmChainID          = "0"
+		name                = "example eth request event spec"
+		contractAddress     = "0x613a38AC1659769640aaE063C651F48E0250454C"
+		externalJobID       = "%s"
+		observationSource   = """
+		    ds1          [type=http method=GET url="http://example.com" allowunrestrictednetworkaccess="true"];
+		    ds1_merge    [type=merge left="{}"]
+		    ds1_parse    [type=jsonparse path="USD"];
+		    ds1_multiply [type=multiply times=100];
+		    ds1 -> ds1_parse -> ds1_multiply;
+		"""
+		`, uuid.New())
+
+	erejb, err := directrequest.ValidatedDirectRequestSpec(drSpec)
 	require.NoError(t, err)
 	err = app.AddJobV2(testutils.Context(t), &erejb)
 	require.NoError(t, err)