extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-20 03:47:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

change tests to not hardcode the local path to source on my laptop

Browse Source
This commit is contained in:
David Dworken 2022-04-09 11:55:00 -07:00
parent 9ce1de69b4
commit 9f20074a4f
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/client_test.go
View File

@ -159,7 +159,6 @@ func TestIntegrationWithNewDevice(t *testing.T) {
func installHishtory(t *testing.T, userSecret string) string { func installHishtory(t *testing.T, userSecret string) string {
out := RunInteractiveBashCommands(t, ` out := RunInteractiveBashCommands(t, `
gvm use go1.17 gvm use go1.17
cd /home/david/code/hishtory
go build -o /tmp/client go build -o /tmp/client
/tmp/client install `+userSecret) /tmp/client install `+userSecret)
r := regexp.MustCompile(`Setting secret hishtory key to (.*)`) r := regexp.MustCompile(`Setting secret hishtory key to (.*)`)

19
shared/testutils.go
View File

@ -36,22 +36,35 @@ func BackupAndRestore(t *testing.T) func() {
} }
func buildServer(t *testing.T) { func buildServer(t *testing.T) {
err := os.Chdir("/home/david/code/hishtory/") for {
wd, err := os.Getwd()
if err != nil {
t.Fatalf("failed to getwd: %v", err)
}
if strings.HasSuffix(wd, "/hishtory") {
break
}
err = os.Chdir("../")
if err != nil { if err != nil {
t.Fatalf("failed to chdir: %v", err) t.Fatalf("failed to chdir: %v", err)
} }
if wd == "/" {
t.Fatalf("failed to cd into hishtory dir!")
}
}
cmd := exec.Command("go", "build", "-o", "/tmp/server", "backend/server/server.go") cmd := exec.Command("go", "build", "-o", "/tmp/server", "backend/server/server.go")
var stdout bytes.Buffer var stdout bytes.Buffer
cmd.Stdout = &stdout cmd.Stdout = &stdout
var stderr bytes.Buffer var stderr bytes.Buffer
cmd.Stderr = &stderr cmd.Stderr = &stderr
err = cmd.Start() err := cmd.Start()
if err != nil { if err != nil {
t.Fatalf("failed to start to build server: %v, stderr=%#v, stdout=%#v", err, stderr.String(), stdout.String()) t.Fatalf("failed to start to build server: %v, stderr=%#v, stdout=%#v", err, stderr.String(), stdout.String())
} }
err = cmd.Wait() err = cmd.Wait()
if err != nil { if err != nil {
t.Fatalf("failed to build server: %v, stderr=%#v, stdout=%#v", err, stderr.String(), stdout.String()) wd, _ := os.Getwd()
t.Fatalf("failed to build server: %v, wd=%#v, stderr=%#v, stdout=%#v", err, wd, stderr.String(), stdout.String())
} }
} }