Skip to content

Commit 39ca4fa

Browse files
jbardinjbardin
committed
Ensure that backend tests check for data in state
Test should not simply check for the existence of a file for state, but make sure that file also contains data.
1 parent 7590154 commit 39ca4fa

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

‎command/meta_backend_test.go‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestMetaBackend_emptyDir(t *testing.T) {
4949

5050
// Verify no backend state was made
5151
if !isEmptyState(filepath.Join(m.DataDir(), DefaultStateFilename)) {
52-
t.Fatal("backend state shoudl be empty")
52+
t.Fatal("backend state should be empty")
5353
}
5454
}
5555

@@ -125,8 +125,8 @@ func TestMetaBackend_emptyWithDefaultState(t *testing.T) {
125125
}
126126

127127
// Verify a backup was made since we're modifying a pre-existing state
128-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
129-
t.Fatalf("err: %s", err)
128+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
129+
t.Fatal("backup state should not be empty")
130130
}
131131
}
132132

@@ -195,8 +195,8 @@ func TestMetaBackend_emptyWithExplicitState(t *testing.T) {
195195
}
196196

197197
// Verify a backup was made since we're modifying a pre-existing state
198-
if _, err := os.Stat(statePath + DefaultBackupExtension); err != nil {
199-
t.Fatalf("err: %s", err)
198+
if isEmptyState(statePath + DefaultBackupExtension) {
199+
t.Fatal("backup state should not be empty")
200200
}
201201
}
202202

@@ -311,13 +311,13 @@ func TestMetaBackend_configureNew(t *testing.T) {
311311
}
312312

313313
// Verify the default paths don't exist
314-
if !isEmptyState(DefaultStateFilename) {
315-
t.Fatalf("state should not exist")
314+
if _, err := os.Stat(DefaultStateFilename); err == nil {
315+
t.Fatalf("err: %s", err)
316316
}
317317

318318
// Verify a backup doesn't exist
319-
if !isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
320-
t.Fatalf("backup state should not exist")
319+
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err == nil {
320+
t.Fatalf("err: %s", err)
321321
}
322322
}
323323

@@ -1100,8 +1100,8 @@ func TestMetaBackend_configuredUnsetCopy(t *testing.T) {
11001100
}
11011101

11021102
// Verify a backup since it wasn't empty to start
1103-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
1104-
t.Fatalf("err: %s", err)
1103+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
1104+
t.Fatal("backup is empty")
11051105
}
11061106
}
11071107

@@ -1903,8 +1903,8 @@ func TestMetaBackend_configuredUnsetWithLegacyCopyBackend(t *testing.T) {
19031903
}
19041904

19051905
// Verify a local backup
1906-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
1907-
t.Fatalf("err: %s", err)
1906+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
1907+
t.Fatal("backup is empty")
19081908
}
19091909
}
19101910

@@ -2001,8 +2001,8 @@ func TestMetaBackend_configuredUnsetWithLegacyCopyLegacy(t *testing.T) {
20012001
}
20022002

20032003
// Verify a local backup
2004-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
2005-
t.Fatalf("err: %s", err)
2004+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
2005+
t.Fatal("backup is empty")
20062006
}
20072007
}
20082008

@@ -2043,13 +2043,13 @@ func TestMetaBackend_configuredUnsetWithLegacyCopyBoth(t *testing.T) {
20432043
}
20442044

20452045
// Verify the default paths exist
2046-
if _, err := os.Stat(DefaultStateFilename); err != nil {
2047-
t.Fatalf("err: %s", err)
2046+
if isEmptyState(DefaultStateFilename) {
2047+
t.Fatal("state is empty")
20482048
}
20492049

20502050
// Verify a backup exists
2051-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
2052-
t.Fatalf("err: %s", err)
2051+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
2052+
t.Fatal("backup is empty")
20532053
}
20542054

20552055
// Verify we have no configured backend/legacy
@@ -2099,8 +2099,8 @@ func TestMetaBackend_configuredUnsetWithLegacyCopyBoth(t *testing.T) {
20992099
}
21002100

21012101
// Verify a local backup
2102-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
2103-
t.Fatalf("err: %s", err)
2102+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
2103+
t.Fatal("backup is empty")
21042104
}
21052105
}
21062106

@@ -2276,8 +2276,8 @@ func TestMetaBackend_planLocalStatePath(t *testing.T) {
22762276
}
22772277

22782278
// Verify we have a backup
2279-
if _, err := os.Stat(statePath + DefaultBackupExtension); err != nil {
2280-
t.Fatalf("err: %s", err)
2279+
if isEmptyState(statePath + DefaultBackupExtension) {
2280+
t.Fatal("backup is empty")
22812281
}
22822282
}
22832283

@@ -2321,8 +2321,8 @@ func TestMetaBackend_planLocalMatch(t *testing.T) {
23212321
}
23222322

23232323
// Verify the default path
2324-
if _, err := os.Stat(DefaultStateFilename); err != nil {
2325-
t.Fatalf("err: %s", err)
2324+
if isEmptyState(DefaultStateFilename) {
2325+
t.Fatal("state is empty")
23262326
}
23272327

23282328
// Verify a backup exists
@@ -2362,8 +2362,8 @@ func TestMetaBackend_planLocalMatch(t *testing.T) {
23622362
}
23632363

23642364
// Verify local backup
2365-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err != nil {
2366-
t.Fatalf("err: %s", err)
2365+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
2366+
t.Fatal("backup is empty")
23672367
}
23682368
}
23692369

@@ -2521,13 +2521,13 @@ func TestMetaBackend_planBackendEmptyDir(t *testing.T) {
25212521
}
25222522

25232523
// Verify the default path
2524-
if _, err := os.Stat(DefaultStateFilename); err == nil {
2525-
t.Fatalf("err: %s", err)
2524+
if isEmptyState(DefaultStateFilename) {
2525+
t.Fatal("state is empty")
25262526
}
25272527

25282528
// Verify a backup exists
2529-
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err == nil {
2530-
t.Fatalf("err: %s", err)
2529+
if isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
2530+
t.Fatal("backup is empty")
25312531
}
25322532

25332533
// Verify we have no configured backend/legacy
@@ -2622,12 +2622,12 @@ func TestMetaBackend_planBackendMatch(t *testing.T) {
26222622
t.Fatalf("bad: %#v", state)
26232623
}
26242624

2625-
// Verify the default path
2625+
// Verify the default path exists
26262626
if _, err := os.Stat(DefaultStateFilename); err == nil {
26272627
t.Fatalf("err: %s", err)
26282628
}
26292629

2630-
// Verify a backup exists
2630+
// Verify a backup doesn't exist
26312631
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err == nil {
26322632
t.Fatalf("err: %s", err)
26332633
}
@@ -2720,7 +2720,7 @@ func TestMetaBackend_planBackendMismatchLineage(t *testing.T) {
27202720
t.Fatalf("bad: %#v", actual)
27212721
}
27222722

2723-
// Verify a backup doesn't exists
2723+
// Verify a backup doesn't exist
27242724
if _, err := os.Stat(DefaultStateFilename + DefaultBackupExtension); err == nil {
27252725
t.Fatalf("err: %s", err)
27262726
}

0 commit comments

Comments
 (0)