label_test: nits on errors

kolyshkin · kolyshkin · commit 5ddcb86920a2 · 2021-03-01T10:33:01.000-08:00
Simplify and improve error logging.

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/go-selinux/label/label_linux_test.go b/go-selinux/label/label_linux_test.go
@@ -22,46 +22,39 @@ func TestInit(t *testing.T) {
 	var testNull []string
 	_, _, err := InitLabels(testNull)
 	if err != nil {
-		t.Log("InitLabels Failed")
-		t.Fatal(err)
+		t.Fatalf("InitLabels failed: %v:", err)
 	}
 	testDisabled := []string{"disable"}
 	roMountLabel := ROMountLabel()
 	if roMountLabel == "" {
-		t.Errorf("ROMountLabel Failed")
+		t.Fatal("ROMountLabel: empty")
 	}
 	plabel, _, err := InitLabels(testDisabled)
 	if err != nil {
-		t.Log("InitLabels Disabled Failed")
-		t.Fatal(err)
+		t.Fatalf("InitLabels(disabled) failed: %v", err)
 	}
 	if plabel != "" {
-		t.Log("InitLabels Disabled Failed")
-		t.FailNow()
+		t.Fatalf("InitLabels(disabled): %q not empty", plabel)
 	}
 	testUser := []string{"user:user_u", "role:user_r", "type:user_t", "level:s0:c1,c15"}
 	plabel, mlabel, err := InitLabels(testUser)
 	if err != nil {
-		t.Log("InitLabels User Failed")
-		t.Fatal(err)
+		t.Fatalf("InitLabels(user) failed: %v", err)
 	}
 	if plabel != "user_u:user_r:user_t:s0:c1,c15" || (mlabel != "user_u:object_r:container_file_t:s0:c1,c15" && mlabel != "user_u:object_r:svirt_sandbox_file_t:s0:c1,c15") {
-		t.Logf("InitLabels User Match Failed %s, %s", plabel, mlabel)
-		t.Log(plabel, mlabel)
-		t.Fatal(err)
+		t.Fatalf("InitLabels(user) failed (plabel=%q, mlabel=%q)", plabel, mlabel)
 	}
 
 	testBadData := []string{"user", "role:user_r", "type:user_t", "level:s0:c1,c15"}
 	if _, _, err = InitLabels(testBadData); err == nil {
-		t.Log("InitLabels Bad Failed")
-		t.Fatal(err)
+		t.Fatal("InitLabels(bad): expected error, got nil")
 	}
 }
 
 func TestDuplicateLabel(t *testing.T) {
 	secopt, err := DupSecOpt("system_u:system_r:container_t:s0:c1,c2")
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("DupSecOpt: %v", err)
 	}
 	for _, opt := range secopt {
 		con := strings.SplitN(opt, ":", 2)
@@ -89,11 +82,11 @@ func TestDuplicateLabel(t *testing.T) {
 			}
 			continue
 		}
-		t.Errorf("DupSecOpt Failed invalid field %q", con[0])
+		t.Errorf("DupSecOpt failed: invalid field %q", con[0])
 	}
 	secopt = DisableSecOpt()
 	if secopt[0] != "disable" {
-		t.Errorf("DisableSecOpt Failed level incorrect %q", secopt[0])
+		t.Errorf("DisableSecOpt failed: expected \"disable\", got %q", secopt[0])
 	}
 }
 func TestRelabel(t *testing.T) {
@@ -172,14 +165,14 @@ func TestSELinuxNoLevel(t *testing.T) {
 	}
 
 	if len(dup) != 3 {
-		t.Errorf("DupSecOpt Failed on non mls label")
+		t.Errorf("DupSecOpt failed on non mls label: expected 3, got %d", len(dup))
 	}
 	con, err := selinux.NewContext(tlabel)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if con.Get() != tlabel {
-		t.Errorf("NewContaxt and con.Get() Failed on non mls label")
+		t.Errorf("NewContaxt and con.Get() failed on non mls label: expexcted %q, got %q", tlabel, con.Get())
 	}
 }
 
@@ -221,11 +214,9 @@ func TestFileLabel(t *testing.T) {
 	testUser := []string{"filetype:test_file_t", "level:s0:c1,c15"}
 	_, mlabel, err := InitLabels(testUser)
 	if err != nil {
-		t.Log("InitLabels User Failed")
-		t.Fatal(err)
+		t.Fatalf("InitLabels(user) failed: %v", err)
 	}
 	if mlabel != "system_u:object_r:test_file_t:s0:c1,c15" {
-		t.Log("InitLabels filetype Failed")
-		t.Fatal(err)
+		t.Fatalf("InitLabels(filetype) failed: %v", err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -22,46 +22,39 @@ func TestInit(t *testing.T) {`
`22`	`22`	`var testNull []string`
`23`	`23`	`_, _, err := InitLabels(testNull)`
`24`	`24`	`if err != nil {`
`25`		`- t.Log("InitLabels Failed")`
`26`		`- t.Fatal(err)`
	`25`	`+ t.Fatalf("InitLabels failed: %v:", err)`
`27`	`26`	`}`
`28`	`27`	`testDisabled := []string{"disable"}`
`29`	`28`	`roMountLabel := ROMountLabel()`
`30`	`29`	`if roMountLabel == "" {`
`31`		`- t.Errorf("ROMountLabel Failed")`
	`30`	`+ t.Fatal("ROMountLabel: empty")`
`32`	`31`	`}`
`33`	`32`	`plabel, _, err := InitLabels(testDisabled)`
`34`	`33`	`if err != nil {`
`35`		`- t.Log("InitLabels Disabled Failed")`
`36`		`- t.Fatal(err)`
	`34`	`+ t.Fatalf("InitLabels(disabled) failed: %v", err)`
`37`	`35`	`}`
`38`	`36`	`if plabel != "" {`
`39`		`- t.Log("InitLabels Disabled Failed")`
`40`		`- t.FailNow()`
	`37`	`+ t.Fatalf("InitLabels(disabled): %q not empty", plabel)`
`41`	`38`	`}`
`42`	`39`	`testUser := []string{"user:user_u", "role:user_r", "type:user_t", "level:s0:c1,c15"}`
`43`	`40`	`plabel, mlabel, err := InitLabels(testUser)`
`44`	`41`	`if err != nil {`
`45`		`- t.Log("InitLabels User Failed")`
`46`		`- t.Fatal(err)`
	`42`	`+ t.Fatalf("InitLabels(user) failed: %v", err)`
`47`	`43`	`}`
`48`	`44`	`if plabel != "user_u:user_r:user_t:s0:c1,c15" \|\| (mlabel != "user_u:object_r:container_file_t:s0:c1,c15" && mlabel != "user_u:object_r:svirt_sandbox_file_t:s0:c1,c15") {`
`49`		`- t.Logf("InitLabels User Match Failed %s, %s", plabel, mlabel)`
`50`		`- t.Log(plabel, mlabel)`
`51`		`- t.Fatal(err)`
	`45`	`+ t.Fatalf("InitLabels(user) failed (plabel=%q, mlabel=%q)", plabel, mlabel)`
`52`	`46`	`}`
`53`	`47`
`54`	`48`	`testBadData := []string{"user", "role:user_r", "type:user_t", "level:s0:c1,c15"}`
`55`	`49`	`if _, _, err = InitLabels(testBadData); err == nil {`
`56`		`- t.Log("InitLabels Bad Failed")`
`57`		`- t.Fatal(err)`
	`50`	`+ t.Fatal("InitLabels(bad): expected error, got nil")`
`58`	`51`	`}`
`59`	`52`	`}`
`60`	`53`
`61`	`54`	`func TestDuplicateLabel(t *testing.T) {`
`62`	`55`	`secopt, err := DupSecOpt("system_u:system_r:container_t:s0:c1,c2")`
`63`	`56`	`if err != nil {`
`64`		`- t.Fatal(err)`
	`57`	`+ t.Fatalf("DupSecOpt: %v", err)`
`65`	`58`	`}`
`66`	`59`	`for _, opt := range secopt {`
`67`	`60`	`con := strings.SplitN(opt, ":", 2)`
`@@ -89,11 +82,11 @@ func TestDuplicateLabel(t *testing.T) {`
`89`	`82`	`}`
`90`	`83`	`continue`
`91`	`84`	`}`
`92`		`- t.Errorf("DupSecOpt Failed invalid field %q", con[0])`
	`85`	`+ t.Errorf("DupSecOpt failed: invalid field %q", con[0])`
`93`	`86`	`}`
`94`	`87`	`secopt = DisableSecOpt()`
`95`	`88`	`if secopt[0] != "disable" {`
`96`		`- t.Errorf("DisableSecOpt Failed level incorrect %q", secopt[0])`
	`89`	`+ t.Errorf("DisableSecOpt failed: expected \"disable\", got %q", secopt[0])`
`97`	`90`	`}`
`98`	`91`	`}`
`99`	`92`	`func TestRelabel(t *testing.T) {`
`@@ -172,14 +165,14 @@ func TestSELinuxNoLevel(t *testing.T) {`
`172`	`165`	`}`
`173`	`166`
`174`	`167`	`if len(dup) != 3 {`
`175`		`- t.Errorf("DupSecOpt Failed on non mls label")`
	`168`	`+ t.Errorf("DupSecOpt failed on non mls label: expected 3, got %d", len(dup))`
`176`	`169`	`}`
`177`	`170`	`con, err := selinux.NewContext(tlabel)`
`178`	`171`	`if err != nil {`
`179`	`172`	`t.Fatal(err)`
`180`	`173`	`}`
`181`	`174`	`if con.Get() != tlabel {`
`182`		`- t.Errorf("NewContaxt and con.Get() Failed on non mls label")`
	`175`	`+ t.Errorf("NewContaxt and con.Get() failed on non mls label: expexcted %q, got %q", tlabel, con.Get())`
`183`	`176`	`}`
`184`	`177`	`}`
`185`	`178`
`@@ -221,11 +214,9 @@ func TestFileLabel(t *testing.T) {`
`221`	`214`	`testUser := []string{"filetype:test_file_t", "level:s0:c1,c15"}`
`222`	`215`	`_, mlabel, err := InitLabels(testUser)`
`223`	`216`	`if err != nil {`
`224`		`- t.Log("InitLabels User Failed")`
`225`		`- t.Fatal(err)`
	`217`	`+ t.Fatalf("InitLabels(user) failed: %v", err)`
`226`	`218`	`}`
`227`	`219`	`if mlabel != "system_u:object_r:test_file_t:s0:c1,c15" {`
`228`		`- t.Log("InitLabels filetype Failed")`
`229`		`- t.Fatal(err)`
	`220`	`+ t.Fatalf("InitLabels(filetype) failed: %v", err)`
`230`	`221`	`}`
`231`	`222`	`}`