Test order

Signed-off-by: joshvanl <[email protected]>

Author: JoshVanL

tests/e2e/standalone/run_template_test.go

@@ -47,8 +47,8 @@ func TestRunWithTemplateFile(t *testing.T) {
 	})
 	// These tests are dependent on run template files in ../testdata/run-template-files folder.
 
-	t.Run("invalid template file wrong emit metrics app run", func(t *testing.T) {
-		runFilePath := "../testdata/run-template-files/wrong_emit_metrics_app_dapr.yaml"
+	t.Run("valid template file", func(t *testing.T) {
+		runFilePath := "../testdata/run-template-files/dapr.yaml"
 		t.Cleanup(func() {
 			// assumption in the test is that there is only one set of app and daprd logs in the logs directory.
 			cleanUpLogs()
@@ -62,17 +62,22 @@ func TestRunWithTemplateFile(t *testing.T) {
 		require.NoError(t, err, "run failed")
 		// Deterministic output for template file, so we can assert line by line
 		lines := strings.Split(output, "\n")
-		assert.GreaterOrEqual(t, len(lines), 4, "expected at least 4 lines in output of starting two apps")
+		assert.GreaterOrEqual(t, len(lines), 6, "expected at least 6 lines in output of starting two apps")
+		assert.Contains(t, lines[0], "Validating config and starting app \"processor\"")
 		assert.Contains(t, lines[1], "Started Dapr with app id \"processor\". HTTP Port: 3510.")
 		assert.Contains(t, lines[2], "Writing log files to directory")
 		assert.Contains(t, lines[2], "tests/apps/processor/.dapr/logs")
+		assert.Contains(t, lines[3], "Validating config and starting app \"emit-metrics\"")
 		assert.Contains(t, lines[4], "Started Dapr with app id \"emit-metrics\". HTTP Port: 3511.")
 		assert.Contains(t, lines[5], "Writing log files to directory")
 		assert.Contains(t, lines[5], "tests/apps/emit-metrics/.dapr/logs")
 		assert.Contains(t, output, "Received signal to stop Dapr and app processes. Shutting down Dapr and app processes.")
 		appTestOutput := AppTestOutput{
 			appID:          "processor",
 			baseLogDirPath: "../../apps/processor/.dapr/logs",
+			appLogContents: []string{
+				"Received metrics:  {1}",
+			},
 			daprdLogContent: []string{
 				"HTTP server is running on port 3510",
 				"You're up and running! Dapr logs will appear here.",
@@ -83,19 +88,21 @@ func TestRunWithTemplateFile(t *testing.T) {
 			appID:          "emit-metrics",
 			baseLogDirPath: "../../apps/emit-metrics/.dapr/logs",
 			appLogContents: []string{
-				"stat wrongappname.go: no such file or directory",
-				"The App process exited with error code: exit status 1",
+				"DAPR_HTTP_PORT set to 3511",
+				"DAPR_HOST_ADD set to localhost",
+				"Metrics with ID 1 sent",
 			},
 			daprdLogContent: []string{
 				"termination signal received: shutting down",
 				"Exited Dapr successfully",
+				"Exited App successfully",
 			},
 		}
 		assertLogOutputForRunTemplateExec(t, appTestOutput)
 	})
 
-	t.Run("valid template file", func(t *testing.T) {
-		runFilePath := "../testdata/run-template-files/dapr.yaml"
+	t.Run("invalid template file wrong emit metrics app run", func(t *testing.T) {
+		runFilePath := "../testdata/run-template-files/wrong_emit_metrics_app_dapr.yaml"
 		t.Cleanup(func() {
 			// assumption in the test is that there is only one set of app and daprd logs in the logs directory.
 			cleanUpLogs()
@@ -109,22 +116,17 @@ func TestRunWithTemplateFile(t *testing.T) {
 		require.NoError(t, err, "run failed")
 		// Deterministic output for template file, so we can assert line by line
 		lines := strings.Split(output, "\n")
-		assert.GreaterOrEqual(t, len(lines), 6, "expected at least 6 lines in output of starting two apps")
-		assert.Contains(t, lines[0], "Validating config and starting app \"processor\"")
+		assert.GreaterOrEqual(t, len(lines), 4, "expected at least 4 lines in output of starting two apps")
 		assert.Contains(t, lines[1], "Started Dapr with app id \"processor\". HTTP Port: 3510.")
 		assert.Contains(t, lines[2], "Writing log files to directory")
 		assert.Contains(t, lines[2], "tests/apps/processor/.dapr/logs")
-		assert.Contains(t, lines[3], "Validating config and starting app \"emit-metrics\"")
 		assert.Contains(t, lines[4], "Started Dapr with app id \"emit-metrics\". HTTP Port: 3511.")
 		assert.Contains(t, lines[5], "Writing log files to directory")
 		assert.Contains(t, lines[5], "tests/apps/emit-metrics/.dapr/logs")
 		assert.Contains(t, output, "Received signal to stop Dapr and app processes. Shutting down Dapr and app processes.")
 		appTestOutput := AppTestOutput{
 			appID:          "processor",
 			baseLogDirPath: "../../apps/processor/.dapr/logs",
-			appLogContents: []string{
-				"Received metrics:  {1}",
-			},
 			daprdLogContent: []string{
 				"HTTP server is running on port 3510",
 				"You're up and running! Dapr logs will appear here.",
@@ -135,14 +137,12 @@ func TestRunWithTemplateFile(t *testing.T) {
 			appID:          "emit-metrics",
 			baseLogDirPath: "../../apps/emit-metrics/.dapr/logs",
 			appLogContents: []string{
-				"DAPR_HTTP_PORT set to 3511",
-				"DAPR_HOST_ADD set to localhost",
-				"Metrics with ID 1 sent",
+				"stat wrongappname.go: no such file or directory",
+				"The App process exited with error code: exit status 1",
 			},
 			daprdLogContent: []string{
 				"termination signal received: shutting down",
 				"Exited Dapr successfully",
-				"Exited App successfully",
 			},
 		}
 		assertLogOutputForRunTemplateExec(t, appTestOutput)