TestNotif*: fix

1. TestNotif should check not only for API level >= 6, but also for
   libseccomp >= 2.5.0. Use notifSupported() to fix. Same applies to
   TestNotifUnsupported.

2. Use t.Fatal[f] for places where the error is fatal (i.e. we can not
   continue the test).

Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

seccomp_test.go

@@ -788,35 +788,18 @@ func TestNotif(t *testing.T) {
 	execInSubprocess(t, subprocessNotif)
 }
 func subprocessNotif(t *testing.T) {
-	// seccomp notification requires API level >= 6
-	api, err := GetAPI()
-	if err != nil {
-		if !APILevelIsSupported() {
-			t.Skipf("Skipping test: %s", err)
-		}
-
-		t.Errorf("Error getting API level: %s", err)
-	} else {
-		t.Logf("Got API level %v", api)
-		if api < 6 {
-			err = SetAPI(6)
-			if err != nil {
-				t.Skipf("Skipping test: API level %d is less than 6 and could not set it to 6", api)
-				return
-			}
-		}
+	if err := notifSupported(); err != nil {
+		t.Skip(err)
 	}
 
 	arch, err := GetNativeArch()
 	if err != nil {
-		t.Errorf("Error in GetNativeArch(): %s", err)
-		return
+		t.Fatalf("Error in GetNativeArch(): %s", err)
 	}
 
 	cwd, err := os.Getwd()
 	if err != nil {
-		t.Errorf("Error in Getwd(): %s", err)
-		return
+		t.Fatal(err)
 	}
 
 	// Create a filter that only notifies on chdir. This way, while the
@@ -825,27 +808,27 @@ func subprocessNotif(t *testing.T) {
 	// goroutine uses chdir.
 	filter, err := NewFilter(ActAllow)
 	if err != nil {
-		t.Errorf("Error creating filter: %s", err)
+		t.Fatalf("Error creating filter: %s", err)
 	}
 	defer filter.Release()
 
 	call, err := GetSyscallFromName("chdir")
 	if err != nil {
-		t.Errorf("Error getting syscall number: %s", err)
+		t.Fatalf("Error getting syscall number: %s", err)
 	}
 
 	err = filter.AddRule(call, ActNotify)
 	if err != nil {
-		t.Errorf("Error adding rule to log syscall: %s", err)
+		t.Fatalf("Error adding rule to log syscall: %s", err)
 	}
 
 	nonExistentPath, err := syscall.BytePtrFromString("/non-existent-path")
 	if err != nil {
-		t.Errorf("Error converting string: %s", err)
+		t.Fatalf("Error converting string: %s", err)
 	}
 	currentWorkingDirectory, err := syscall.BytePtrFromString(cwd)
 	if err != nil {
-		t.Errorf("Error converting string: %s", err)
+		t.Fatalf("Error converting string: %s", err)
 	}
 
 	tests := []notifTest{
@@ -955,25 +938,18 @@ func TestNotifUnsupported(t *testing.T) {
 	execInSubprocess(t, subprocessNotifUnsupported)
 }
 func subprocessNotifUnsupported(t *testing.T) {
-	// seccomp notification requires API level >= 6
-	api := 0
-	if APILevelIsSupported() {
-		api, err := GetAPI()
-		if err != nil {
-			t.Errorf("Error getting API level: %s", err)
-		} else if api >= 6 {
-			t.Skipf("Skipping test for old libseccomp support: API level %d is >= 6", api)
-		}
+	if err := notifSupported(); err == nil {
+		t.Skip("seccomp notification is supported")
 	}
 
 	filter, err := NewFilter(ActAllow)
 	if err != nil {
-		t.Errorf("Error creating filter: %s", err)
+		t.Fatalf("Error creating filter: %s", err)
 	}
 	defer filter.Release()
 
 	_, err = filter.GetNotifFd()
 	if err == nil {
-		t.Errorf("Error: GetNotifFd was supposed to fail with API level %d", api)
+		t.Error("GetNotifFd: got nil, want error")
 	}
 }