Refactor: Introduce fn to launch proc and run test

proctl/proctl_test.go

@@ -7,6 +7,8 @@ import (
 	"testing"
 )
 
+type testfunc func(p *DebuggedProcess)
+
 func dataAtAddr(pid int, addr uint64) ([]byte, error) {
 	data := make([]byte, 1)
 	_, err := syscall.PtracePeekData(pid, uintptr(addr), data)
@@ -26,6 +28,22 @@ func getRegisters(p *DebuggedProcess, t *testing.T) *syscall.PtraceRegs {
 	return regs
 }
 
+func withTestProcess(name string, t *testing.T, fn testfunc) {
+	cmd, err := StartTestProcess(name)
+	if err != nil {
+		t.Fatal("Starting test process:", err)
+	}
+
+	pid := cmd.Process.Pid
+	p, err := NewDebugProcess(pid)
+	if err != nil {
+		t.Fatal("NewDebugProcess():", err)
+	}
+	defer cmd.Process.Kill()
+
+	fn(p)
+}
+
 func StartTestProcess(name string) (*exec.Cmd, error) {
 	cmd := exec.Command("../fixtures/" + name)
 
@@ -38,40 +56,19 @@ func StartTestProcess(name string) (*exec.Cmd, error) {
 }
 
 func TestAttachProcess(t *testing.T) {
-	cmd, err := StartTestProcess("testprog")
+	withTestProcess("testprog", t, func(p *DebuggedProcess) {
-	if err != nil {
-		t.Fatal("Starting test process:", err)
-	}
-
-	pid := cmd.Process.Pid
-	p, err := NewDebugProcess(pid)
-	if err != nil {
-		t.Fatal("NewDebugProcess():", err)
-	}
-
 		if !p.ProcessState.Sys().(syscall.WaitStatus).Stopped() {
 			t.Errorf("Process was not stopped correctly")
 		}
-
+	})
-	cmd.Process.Kill()
 }
 
 func TestStep(t *testing.T) {
-	cmd, err := StartTestProcess("testprog")
+	withTestProcess("testprog", t, func(p *DebuggedProcess) {
-	if err != nil {
-		t.Fatal("Starting test process:", err)
-	}
-
-	pid := cmd.Process.Pid
-	p, err := NewDebugProcess(pid)
-	if err != nil {
-		t.Fatal("NewDebugProcess():", err)
-	}
-
 		regs := getRegisters(p, t)
 		rip := regs.PC()
 
-	err = p.Step()
+		err := p.Step()
 		if err != nil {
 			t.Fatal("Step():", err)
 		}
@@ -81,27 +78,16 @@ func TestStep(t *testing.T) {
 		if rip >= regs.PC() {
 			t.Errorf("Expected %#v to be greater than %#v", regs.PC(), rip)
 		}
-
+	})
-	cmd.Process.Kill()
 }
 
 func TestContinue(t *testing.T) {
-	cmd, err := StartTestProcess("continuetestprog")
+	withTestProcess("continuetestprog", t, func(p *DebuggedProcess) {
-	if err != nil {
-		t.Fatal("Starting test process:", err)
-	}
-
-	pid := cmd.Process.Pid
-	p, err := NewDebugProcess(pid)
-	if err != nil {
-		t.Fatal("NewDebugProcess():", err)
-	}
-
 		if p.ProcessState.Exited() {
 			t.Fatal("Process already exited")
 		}
 
-	err = p.Continue()
+		err := p.Continue()
 		if err != nil {
 			t.Fatal("Continue():", err)
 		}
@@ -109,20 +95,11 @@ func TestContinue(t *testing.T) {
 		if !p.ProcessState.Success() {
 			t.Fatal("Process did not exit successfully")
 		}
+	})
 }
 
 func TestBreakPoint(t *testing.T) {
-	cmd, err := StartTestProcess("testprog")
+	withTestProcess("testprog", t, func(p *DebuggedProcess) {
-	if err != nil {
-		t.Fatal("Starting test process:", err)
-	}
-
-	pid := cmd.Process.Pid
-	p, err := NewDebugProcess(pid)
-	if err != nil {
-		t.Fatal("NewDebugProcess():", err)
-	}
-
 		sleepytimefunc := p.GoSymTable.LookupFunc("main.sleepytime")
 		sleepyaddr := sleepytimefunc.Entry
 
@@ -155,49 +132,27 @@ func TestBreakPoint(t *testing.T) {
 		if pc == breakpc {
 			t.Fatalf("Step not respected:\nPC:%d\nFN:%d\n", pc, breakpc)
 		}
-
+	})
-	cmd.Process.Kill()
 }
 
 func TestBreakPointWithNonExistantFunction(t *testing.T) {
-	cmd, err := StartTestProcess("testprog")
+	withTestProcess("testprog", t, func(p *DebuggedProcess) {
-	if err != nil {
+		_, err := p.Break(uintptr(0))
-		t.Fatal("Starting test process:", err)
-	}
-
-	pid := cmd.Process.Pid
-	p, err := NewDebugProcess(pid)
-	if err != nil {
-		t.Fatal("NewDebugProcess():", err)
-	}
-
-	_, err = p.Break(uintptr(0))
 		if err == nil {
 			t.Fatal("Should not be able to break at non existant function")
 		}
-
+	})
-	cmd.Process.Kill()
 }
 
 func TestClearBreakPoint(t *testing.T) {
-	cmd, err := StartTestProcess("testprog")
+	withTestProcess("testprog", t, func(p *DebuggedProcess) {
-	if err != nil {
-		t.Fatal("Starting test process:", err)
-	}
-
-	pid := cmd.Process.Pid
-	p, err := NewDebugProcess(pid)
-	if err != nil {
-		t.Fatal("NewDebugProcess():", err)
-	}
-
 		fn := p.GoSymTable.LookupFunc("main.sleepytime")
 		bp, err := p.Break(uintptr(fn.Entry))
 		if err != nil {
 			t.Fatal("Break():", err)
 		}
 
-	int3, err := dataAtAddr(pid, bp.Addr)
+		int3, err := dataAtAddr(p.Pid, bp.Addr)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -207,7 +162,7 @@ func TestClearBreakPoint(t *testing.T) {
 			t.Fatal("Break():", err)
 		}
 
-	data, err := dataAtAddr(pid, bp.Addr)
+		data, err := dataAtAddr(p.Pid, bp.Addr)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -219,6 +174,5 @@ func TestClearBreakPoint(t *testing.T) {
 		if len(p.BreakPoints) != 0 {
 			t.Fatal("Breakpoint not removed internally")
 		}
-
+	})
-	cmd.Process.Kill()
 }