From 149ccd929e91e71db2cacfe74e7e6b91a6deec79 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Tue, 18 Dec 2018 19:06:49 -0500 Subject: [PATCH] missing commits from 19688 --- command/command_test.go | 2 +- command/init_test.go | 4 ++-- command/meta_backend_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/command/command_test.go b/command/command_test.go index ce6958715..2fa25743b 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -729,7 +729,7 @@ func testBackendState(t *testing.T, s *terraform.State, c int) (*terraform.State state.Backend = &terraform.BackendState{ Type: "http", ConfigRaw: json.RawMessage(fmt.Sprintf(`{"address":%q}`, srv.URL)), - Hash: hash, + Hash: uint64(hash), } return state, srv diff --git a/command/init_test.go b/command/init_test.go index ade5c533c..7b4a076ca 100644 --- a/command/init_test.go +++ b/command/init_test.go @@ -470,7 +470,7 @@ func TestInit_backendReinitWithExtra(t *testing.T) { t.Errorf("wrong config\ngot: %s\nwant: %s", got, want) } - if state.Backend.Hash != cHash { + if state.Backend.Hash != uint64(cHash) { t.Fatal("mismatched state and config backend hashes") } @@ -482,7 +482,7 @@ func TestInit_backendReinitWithExtra(t *testing.T) { if got, want := normalizeJSON(t, state.Backend.ConfigRaw), `{"path":"hello","workspace_dir":null}`; got != want { t.Errorf("wrong config\ngot: %s\nwant: %s", got, want) } - if state.Backend.Hash != cHash { + if state.Backend.Hash != uint64(cHash) { t.Fatal("mismatched state and config backend hashes") } } diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go index 1d363cd8e..f92f8a5bb 100644 --- a/command/meta_backend_test.go +++ b/command/meta_backend_test.go @@ -1750,7 +1750,7 @@ func TestMetaBackend_configureWithExtra(t *testing.T) { // Check the state s := testDataStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename)) - if s.Backend.Hash != cHash { + if s.Backend.Hash != uint64(cHash) { t.Fatal("mismatched state and config backend hashes") } @@ -1766,7 +1766,7 @@ func TestMetaBackend_configureWithExtra(t *testing.T) { // Check the state s = testDataStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename)) - if s.Backend.Hash != cHash { + if s.Backend.Hash != uint64(cHash) { t.Fatal("mismatched state and config backend hashes") } }