Skip to content

Commit

Permalink
cleanup: simplify t.Log and t.Skip and t.Fatal statements
Browse files Browse the repository at this point in the history 
Signed-off-by: Mahe Tardy <[email protected]>
  • Loading branch information
@mtardy
mtardy committed May 11, 2023
1 parent ebf772d commit 282bfbd
Showing 1 changed file with 19 additions and 38 deletions.
57 changes: 19 additions & 38 deletions pkg/sensors/tracing/kprobe_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,15 +406,13 @@ func createTestFile(t *testing.T) (int, int, string) {
// Create file with hello world to read
fd, errno := syscall.Open("/tmp/testfile", syscall.O_CREAT|syscall.O_TRUNC|syscall.O_RDWR, 0x777)
if fd < 0 {
t.Logf("File open failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open failed: %s\n", errno)
}
t.Cleanup(func() { syscall.Close(fd) })
t.Cleanup(func() { os.Remove("/tmp/testfile") })
fd2, errno := syscall.Open("/tmp/testfile", syscall.O_RDWR, 0x770)
if fd2 < 0 {
t.Logf("File open fro read failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open fro read failed: %s\n", errno)
}
t.Cleanup(func() { syscall.Close(fd2) })
return fd, fd2, fmt.Sprint(fd2)
Expand Down Expand Up @@ -442,15 +440,13 @@ func runKprobeObjectRead(t *testing.T, readHook string, checker ec.MultiEventChe
hello := []byte("hello world")
n, errno := syscall.Write(fd, hello)
if n < 0 {
t.Logf("syscall.Write failed: %s\n", errno)
t.Fatal()
t.Fatalf("syscall.Write failed: %s\n", errno)
}
syscall.Fsync(fd)
var readBytes = make([]byte, 100)
i, errno := syscall.Read(fd2, readBytes)
if i < 0 {
t.Logf("syscall.Read failed: %s\n", errno)
t.Fatal()
t.Fatalf("syscall.Read failed: %s\n", errno)
}

err = jsonchecker.JsonTestCheck(t, checker)
Expand Down Expand Up @@ -583,8 +579,7 @@ func testKprobeObjectFiltered(t *testing.T,

if useMount == true {
if err := syscall.Mount("tmpfs", mntPath, "tmpfs", 0, ""); err != nil {
t.Logf("Mount failed: %s\n", err)
t.Skip()
t.Skipf("Mount failed: %s\n", err)
}
t.Cleanup(func() {
if err := syscall.Unmount(mntPath, 0); err != nil {
Expand All @@ -604,8 +599,7 @@ func testKprobeObjectFiltered(t *testing.T,
// Create file to open later
fd, errno := syscall.Open(filePath, syscall.O_CREAT|syscall.O_RDWR, 0x777)
if fd < 0 {
t.Logf("File open failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open failed: %s\n", errno)
}
syscall.Close(fd)

Expand All @@ -623,8 +617,7 @@ func testKprobeObjectFiltered(t *testing.T,
readyWG.Wait()
fd2, errno := syscall.Open(filePath, mode, perm)
if fd2 < 0 {
t.Logf("File open from read failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open from read failed: %s\n", errno)
}
t.Cleanup(func() { syscall.Close(fd2) })
data := "hello world"
Expand Down Expand Up @@ -1200,8 +1193,7 @@ func TestKprobeObjectFilterReturnValueGTOk(t *testing.T) {
// Create file to open later
fd, errno := syscall.Open(path, syscall.O_CREAT|syscall.O_RDWR, 0x777)
if fd < 0 {
t.Logf("File open failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open failed: %s\n", errno)
}
syscall.Close(fd)
defer func() { syscall.Unlink(path) }()
Expand Down Expand Up @@ -1255,8 +1247,7 @@ func TestKprobeObjectFilterReturnValueLTFail(t *testing.T) {
// Create file to open later
fd, errno := syscall.Open(path, syscall.O_CREAT|syscall.O_RDWR, 0x777)
if fd < 0 {
t.Logf("File open failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open failed: %s\n", errno)
}
syscall.Close(fd)
defer func() { syscall.Unlink(path) }()
Expand Down Expand Up @@ -1568,8 +1559,7 @@ func corePathTest(t *testing.T, filePath string, readHook string, writeChecker e
// Create file to open later
fd, errno := syscall.Open(filePath, syscall.O_CREAT|syscall.O_RDWR, 0x777)
if fd < 0 {
t.Logf("File open failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open failed: %s\n", errno)
}
syscall.Close(fd)

Expand All @@ -1588,8 +1578,7 @@ func corePathTest(t *testing.T, filePath string, readHook string, writeChecker e

fd2, errno := syscall.Open(filePath, syscall.O_RDWR, 0x770)
if fd2 < 0 {
t.Logf("File open from read failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open from read failed: %s\n", errno)
}
t.Cleanup(func() { syscall.Close(fd2) })
data := "hello world"
Expand All @@ -1609,12 +1598,10 @@ func testMultipleMountsFiltered(t *testing.T, readHook string) {
path = filepath.Join(path, fmt.Sprintf("tmp%d", i))
pathStack = append(pathStack, path)
if err := os.Mkdir(path, 0755); err != nil {
t.Logf("Mkdir failed: %s\n", err)
t.Skip()
t.Skipf("Mkdir failed: %s\n", err)
}
if err := syscall.Mount("tmpfs", path, "tmpfs", 0, ""); err != nil {
t.Logf("Mount failed: %s\n", err)
t.Skip()
t.Skipf("Mount failed: %s\n", err)
}
}
t.Cleanup(func() {
Expand Down Expand Up @@ -1648,8 +1635,7 @@ func testMultiplePathComponentsFiltered(t *testing.T, readHook string) {
path = filepath.Join(path, fmt.Sprintf("%d", i))
pathStack = append(pathStack, path)
if err := os.Mkdir(path, 0755); err != nil {
t.Logf("Mkdir failed: %s\n", err)
t.Skip()
t.Skipf("Mkdir failed: %s\n", err)
}
}
t.Cleanup(func() {
Expand Down Expand Up @@ -1688,20 +1674,17 @@ func testMultipleMountPathFiltered(t *testing.T, readHook string) {
path = filepath.Join(path, fmt.Sprintf("tmp%d", i))
pathStack = append(pathStack, path)
if err := os.Mkdir(path, 0755); err != nil {
t.Logf("Mkdir failed: %s\n", err)
t.Skip()
t.Skipf("Mkdir failed: %s\n", err)
}
if err := syscall.Mount("tmpfs", path, "tmpfs", 0, ""); err != nil {
t.Logf("Mount failed: %s\n", err)
t.Skip()
t.Skipf("Mount failed: %s\n", err)
}
}
for i := 0; i <= 16; i++ {
path = filepath.Join(path, fmt.Sprintf("%d", i))
dirStack = append(dirStack, path)
if err := os.Mkdir(path, 0755); err != nil {
t.Logf("Mkdir failed: %s\n", err)
t.Skip()
t.Skipf("Mkdir failed: %s\n", err)
}
}
t.Cleanup(func() {
Expand Down Expand Up @@ -2605,8 +2588,7 @@ spec:
func openFile(t *testing.T, file string) int {
fd, errno := syscall.Open(file, syscall.O_RDONLY, 0)
if fd < 0 {
t.Logf("File open failed: %s\n", errno)
t.Fatal()
t.Fatalf("File open failed: %s\n", errno)
}
t.Cleanup(func() { syscall.Close(fd) })
return fd
Expand All @@ -2619,8 +2601,7 @@ func readFile(t *testing.T, file string) int {
var readBytes = make([]byte, 32)
i, errno := syscall.Read(fd, readBytes)
if i < 0 {
t.Logf("syscall.Read failed: %s\n", errno)
t.Fatal()
t.Fatalf("syscall.Read failed: %s\n", errno)
}
return fd
}
Expand Down

0 comments on commit 282bfbd

Please sign in to comment.