fsverity_test.go: fix nil pointer dereference, fix test fail

xbt573 · austinvazquez · commit 10996a334b2d · 2024-11-09T10:27:26.000-08:00
Signed-off-by: Alexey Lunev <cheembox573@gmail.com> (cherry picked from commit 8a8e50e) Signed-off-by: Austin Vazquez <macedonv@amazon.com>
diff --git a/internal/fsverity/fsverity_test.go b/internal/fsverity/fsverity_test.go
@@ -123,8 +123,8 @@ func TestIsEnabled(t *testing.T) {
 		t.Errorf("fsverity Enable failed: %s", err.Error())
 	}
 
-	if enabled, err := IsEnabled(verityFile); !enabled || err != nil {
-		t.Errorf("expected fsverity to be enabled on file, received enabled: %t; error: %s", enabled, err.Error())
+	if enabled, err := IsEnabled(verityFile); !enabled && err != nil {
+		t.Errorf("expected fsverity to be enabled on file, received enabled: %t; error: %v", enabled, err)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ func TestIsEnabled(t *testing.T) {`
`123`	`123`	`t.Errorf("fsverity Enable failed: %s", err.Error())`
`124`	`124`	`}`
`125`	`125`
`126`		`- if enabled, err := IsEnabled(verityFile); !enabled \|\| err != nil {`
`127`		`- t.Errorf("expected fsverity to be enabled on file, received enabled: %t; error: %s", enabled, err.Error())`
	`126`	`+ if enabled, err := IsEnabled(verityFile); !enabled && err != nil {`
	`127`	`+ t.Errorf("expected fsverity to be enabled on file, received enabled: %t; error: %v", enabled, err)`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`