[beam] branch master updated: Fix test ordering issue (#17350)

[lostluck]

This is an automated email from the ASF dual-hosted git repository.

lostluck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 8a9472fb065 Fix test ordering issue (#17350)
8a9472fb065 is described below

commit 8a9472fb0652d50413a5e05191351ab85b5e17ee
Author: Danny McCormick <dannymccorm...@google.com>
AuthorDate: Tue Apr 12 11:50:12 2022 -0400

    Fix test ordering issue (#17350)
---
 sdks/go/pkg/beam/runners/dataflow/dataflow_test.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sdks/go/pkg/beam/runners/dataflow/dataflow_test.go 
b/sdks/go/pkg/beam/runners/dataflow/dataflow_test.go
index d6af41b84bd..29118de855e 100644
--- a/sdks/go/pkg/beam/runners/dataflow/dataflow_test.go
+++ b/sdks/go/pkg/beam/runners/dataflow/dataflow_test.go
@@ -143,21 +143,22 @@ func TestGetJobOptions_InvalidAutoscaling(t *testing.T) {
        }
 }
 
-func TestGetJobOptions_DockerNoImage(t *testing.T) {
+func TestGetJobOptions_DockerWithImage(t *testing.T) {
        *jobopts.EnvironmentType = "docker"
        *jobopts.EnvironmentConfig = "testContainerImage"
+       *image = "testContainerImageOverride"
 
-       if got, want := getContainerImage(context.Background()), 
"testContainerImage"; got != want {
+       if got, want := getContainerImage(context.Background()), 
"testContainerImageOverride"; got != want {
                t.Fatalf("getContainerImage() = %q, want %q", got, want)
        }
 }
 
-func TestGetJobOptions_DockerWithImage(t *testing.T) {
+func TestGetJobOptions_DockerNoImage(t *testing.T) {
        *jobopts.EnvironmentType = "docker"
        *jobopts.EnvironmentConfig = "testContainerImage"
-       *image = "testContainerImageOverride"
+       *image = ""
 
-       if got, want := getContainerImage(context.Background()), 
"testContainerImageOverride"; got != want {
+       if got, want := getContainerImage(context.Background()), 
"testContainerImage"; got != want {
                t.Fatalf("getContainerImage() = %q, want %q", got, want)
        }
 }