tests for watch function. Introduced a new timer mainly for testing purposes. can be turned into a feature later.

Author: simonmittag

cmd/l0la/main.go

@@ -45,6 +45,14 @@ func main() {
 	}
 }
 
+func parseSecs() (int, error) {
+	if len(flag.Args()) != 1 {
+		return 0, errors.New("pid not supplied")
+	}
+	pid, err := strconv.Atoi(flag.Args()[0])
+	return pid, err
+}
+
 func parsePid() (int, error) {
 	if len(flag.Args()) != 1 {
 		return 0, errors.New("pid not supplied")

cmd/l0la/main_test.go

@@ -18,13 +18,6 @@ func TestMainFuncWithUsage(t *testing.T) {
 	main()
 }
 
-//infinite loop
-//func TestMainFuncWithPositionalArgsBeforeFlagArgs(t *testing.T) {
-//	//first arg is command
-//	os.Args = []string{"l0la", fmt.Sprintf("%v", os.Getpid())}
-//	main()
-//}
-
 func TestPrintVersion(t *testing.T) {
 	printVersion()
 }

l0la.go

@@ -10,7 +10,7 @@ import (
 
 const Version = "v0.1.3"
 
-func Watch(pid int) {
+func Watch(pid int, seconds ...int) {
 	lines := make([]io.Writer, 0)
 	l0 := uilive.New()
 	l0.RefreshInterval = time.Hour * 24 * 30
@@ -25,23 +25,35 @@ func Watch(pid int) {
 	pad := 26
 	s := NewSpinnerAnim()
 
+	timer := time.NewTimer(time.Hour * 24)
+	if len(seconds) > 0 && seconds[0] >= 1 {
+		timer = time.NewTimer(time.Second * time.Duration(seconds[0]))
+	}
+
 	if PidgrepActive(pid) {
+	Watch:
 		for {
-			fmt.Fprint(lines[0], Logo()+"\n")
-			fmt.Fprintf(lines[0], "%s watching pid: %v %s \n", s.Next(), pid, Pidgrepstatus(pid))
-			fmt.Fprintf(lines[0], "┏━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n")
-			fmt.Fprintf(lines[0], "┃ TCP conns   ┃ %s ┃\n", Red(LPad(pad, FGroup(Conngrep(pid)))))
-			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-			fmt.Fprintf(lines[0], "┃ Open files  ┃ %s ┃\n", Yellow(LPad(pad, FGroup(Filegrep(pid)))))
-			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-			fmt.Fprintf(lines[0], "┃ Threads     ┃ %s ┃\n", Blue(LPad(pad, FGroup(Threadgrep(pid)))))
-			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-			fmt.Fprintf(lines[0], "┃ RSS bytes   ┃ %s ┃\n", Gray(8, LPad(pad, FGroup(Memgrep(pid)))))
-			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-			fmt.Fprintf(lines[0], "┃ CPU percent ┃ %s ┃\n", Magenta(LPad(pad, Cpugrep(pid))))
-			fmt.Fprintf(lines[0], "┗━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\n")
-			l0.Flush()
-			time.Sleep(time.Millisecond * 500)
+			select {
+			case <-timer.C:
+				break Watch
+			default:
+
+				fmt.Fprint(lines[0], Logo()+"\n")
+				fmt.Fprintf(lines[0], "%s watching pid: %v %s \n", s.Next(), pid, Pidgrepstatus(pid))
+				fmt.Fprintf(lines[0], "┏━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n")
+				fmt.Fprintf(lines[0], "┃ TCP conns   ┃ %s ┃\n", Red(LPad(pad, FGroup(Conngrep(pid)))))
+				fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+				fmt.Fprintf(lines[0], "┃ Open files  ┃ %s ┃\n", Yellow(LPad(pad, FGroup(Filegrep(pid)))))
+				fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+				fmt.Fprintf(lines[0], "┃ Threads     ┃ %s ┃\n", Blue(LPad(pad, FGroup(Threadgrep(pid)))))
+				fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+				fmt.Fprintf(lines[0], "┃ RSS bytes   ┃ %s ┃\n", Gray(8, LPad(pad, FGroup(Memgrep(pid)))))
+				fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+				fmt.Fprintf(lines[0], "┃ CPU percent ┃ %s ┃\n", Magenta(LPad(pad, Cpugrep(pid))))
+				fmt.Fprintf(lines[0], "┗━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\n")
+				l0.Flush()
+				time.Sleep(time.Millisecond * 500)
+			}
 		}
 	} else {
 		fmt.Printf(Logo())

l0la_test.go

@@ -0,0 +1,10 @@
+package l0la
+
+import (
+	"os"
+	"testing"
+)
+
+func TestWatch(t *testing.T) {
+	Watch(os.Getpid(), 4)
+}