extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-08-17 02:11:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

working update

Browse Source
This commit is contained in:
David Dworken
2022-04-06 18:18:46 -07:00
parent 7e51d5fe42
commit 684511f4f7
8 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
shared/testutils.go
View File

@ -1,13 +1,13 @@
package shared
import (
"testing"
"time"
"os"
"path"
"os/exec"
"bytes"
"fmt"
"os"
"os/exec"
"path"
"testing"
"time"
)
func ResetLocalState(t *testing.T) {
@ -15,7 +15,7 @@ func ResetLocalState(t *testing.T) {
if err != nil {
t.Fatalf("failed to retrieve homedir: %v", err)
}
os.Remove(path.Join(homedir, HISHTORY_PATH, DB_PATH))
os.Remove(path.Join(homedir, HISHTORY_PATH, CONFIG_PATH))
}
@ -39,7 +39,7 @@ func buildServer(t *testing.T) {
if err != nil {
t.Fatalf("failed to chdir: %v", err)
}
cmd := exec.Command("go", "build", "-o", "/tmp/server","server/server.go")
cmd := exec.Command("go", "build", "-o", "/tmp/server", "server/server.go")
var stdout bytes.Buffer
cmd.Stdout = &stdout
var stderr bytes.Buffer
@ -55,21 +55,21 @@ func buildServer(t *testing.T) {
}
func RunTestServer(t *testing.T) func() {
os.Setenv("HISHTORY_SERVER" ,"http://localhost:8080")
os.Setenv("HISHTORY_SERVER", "http://localhost:8080")
buildServer(t)
cmd := exec.Command( "/tmp/server" )
var stdout bytes.Buffer
cmd := exec.Command("/tmp/server")
var stdout bytes.Buffer
cmd.Stdout = &stdout
var stderr bytes.Buffer
cmd.Stderr = &stderr
err := cmd.Start()
if err != nil {
t.Fatalf("failed to start server: %v", err)
}
time.Sleep(time.Second*3)
go func() {
cmd.Wait()
}()
err := cmd.Start()
if err != nil {
t.Fatalf("failed to start server: %v", err)
}
time.Sleep(time.Second * 3)
go func() {
cmd.Wait()
}()
return func() {
err := cmd.Process.Kill()
if err != nil {
@ -93,7 +93,7 @@ func CheckWithInfo(t *testing.T, err error, additionalInfo string) {
}
func EntryEquals(entry1, entry2 HistoryEntry) bool {
return entry1.LocalUsername == entry2.LocalUsername &&
return entry1.LocalUsername == entry2.LocalUsername &&
entry1.Hostname == entry2.Hostname &&
entry1.Command == entry2.Command &&
entry1.CurrentWorkingDirectory == entry2.CurrentWorkingDirectory &&
@ -104,12 +104,12 @@ func EntryEquals(entry1, entry2 HistoryEntry) bool {
func MakeFakeHistoryEntry(command string) HistoryEntry {
return HistoryEntry{
LocalUsername: "david",
Hostname: "localhost",
Command: command,
LocalUsername: "david",
Hostname: "localhost",
Command: command,
CurrentWorkingDirectory: "/tmp/",
ExitCode: 2,
StartTime: time.Now(),
EndTime: time.Now(),
ExitCode: 2,
StartTime: time.Now(),
EndTime: time.Now(),
}
}
}