Ensure that nomad config is copied over when not nil

hashicorp · Oct 4, 2022 · f3e8f8a · f3e8f8a
1 parent bf05ae5
commit f3e8f8a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           go-version: ${{ matrix.go }}
 
-      - name: Install Consul and Vault for integration testing
+      - name: Install Consul, Vault and Nomad for integration testing
         run: |
           curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
           sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"

diff --git a/config/config.go b/config/config.go
@@ -173,7 +173,7 @@ func (c *Config) Copy() *Config {
 	o.BlockQueryWaitTime = c.BlockQueryWaitTime
 
 	if c.Nomad != nil {
-		o.Nomad = o.Nomad.Copy()
+		o.Nomad = c.Nomad.Copy()
 	}
 
 	return &o

diff --git a/manager/runner_test.go b/manager/runner_test.go
@@ -1155,8 +1155,8 @@ func TestRunner_command(t *testing.T) {
 		case stderr.Len() > 0:
 			t.Errorf("unexpected error output: %s", stderr.String())
 		case tc.out != stdout.String():
-			t.Errorf("wrong command output\n   got: '%#v'\nwanted: '%#v'",
-				stdout.String(), tc.out)
+			t.Errorf("wrong command output: %s \n   got: '%#v'\nwanted: '%#v'",
+				tc.name, stdout.String(), tc.out)
 		}
 	}
 	for i, tc := range []testCase{