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

Revert all commits since v0.223 to enable me to release a patch on top of v0.223

Browse Source
This commit is contained in:
David Dworken
2023-09-28 21:49:37 -07:00
parent 98b6eb57d0
commit 68ed9f2d5d
17 changed files with 254 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
shared/testutils/testutils.go
View File

@ -18,7 +18,6 @@ import (
"github.com/ddworken/hishtory/client/data"
"github.com/google/go-cmp/cmp"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
)
const (
@ -50,7 +49,7 @@ func getInitialWd() string {
func ResetLocalState(t *testing.T) {
homedir, err := os.UserHomeDir()
require.NoError(t, err)
Check(t, err)
persistLog()
_ = BackupAndRestoreWithId(t, "-reset-local-state")
_ = os.RemoveAll(path.Join(homedir, data.GetHishtoryPath()))
@ -70,10 +69,10 @@ func getBackPath(file, id string) string {
func BackupAndRestoreWithId(t testing.TB, id string) func() {
ResetFakeHistoryTimestamp()
homedir, err := os.UserHomeDir()
require.NoError(t, err)
Check(t, err)
initialWd, err := os.Getwd()
require.NoError(t, err)
require.NoError(t, os.MkdirAll(path.Join(homedir, data.GetHishtoryPath()+".test"), os.ModePerm))
Check(t, err)
Check(t, os.MkdirAll(path.Join(homedir, data.GetHishtoryPath()+".test"), os.ModePerm))
renameFiles := []string{
path.Join(homedir, data.GetHishtoryPath(), data.DB_PATH),
@ -90,7 +89,7 @@ func BackupAndRestoreWithId(t testing.TB, id string) func() {
}
for _, file := range renameFiles {
touchFile(file)
require.NoError(t, os.Rename(file, getBackPath(file, id)))
Check(t, os.Rename(file, getBackPath(file, id)))
}
copyFiles := []string{
path.Join(homedir, ".zshrc"),
@ -99,7 +98,7 @@ func BackupAndRestoreWithId(t testing.TB, id string) func() {
}
for _, file := range copyFiles {
touchFile(file)
require.NoError(t, copy(file, getBackPath(file, id)))
Check(t, copy(file, getBackPath(file, id)))
}
configureZshrc(homedir)
touchFile(path.Join(homedir, ".bash_history"))
@ -112,8 +111,8 @@ func BackupAndRestoreWithId(t testing.TB, id string) func() {
t.Fatalf("failed to execute killall hishtory, stdout=%#v: %v", string(stdout), err)
}
persistLog()
require.NoError(t, os.RemoveAll(path.Join(homedir, data.GetHishtoryPath())))
require.NoError(t, os.MkdirAll(path.Join(homedir, data.GetHishtoryPath()), os.ModePerm))
Check(t, os.RemoveAll(path.Join(homedir, data.GetHishtoryPath())))
Check(t, os.MkdirAll(path.Join(homedir, data.GetHishtoryPath()), os.ModePerm))
for _, file := range renameFiles {
checkError(os.Rename(getBackPath(file, id), file))
}
@ -291,6 +290,20 @@ func RunTestServer() func() {
}
}
func Check(t testing.TB, err error) {
if err != nil {
_, filename, line, _ := runtime.Caller(1)
t.Fatalf("Unexpected error at %s:%d: %v", filename, line, err)
}
}
func CheckWithInfo(t *testing.T, err error, additionalInfo string) {
if err != nil {
_, filename, line, _ := runtime.Caller(1)
t.Fatalf("Unexpected error: %v at %s:%d! Additional info: %v", err, filename, line, additionalInfo)
}
}
func IsOnline() bool {
_, err := http.Get("https://hishtory.dev")
return err == nil
@ -325,12 +338,12 @@ func IsGithubAction() bool {
func TestLog(t testing.TB, line string) {
f, err := os.OpenFile("/tmp/test.log", os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
if err != nil {
require.NoError(t, err)
Check(t, err)
}
defer f.Close()
_, err = f.WriteString(line + "\n")
if err != nil {
require.NoError(t, err)
Check(t, err)
}
}
@ -359,7 +372,7 @@ func CompareGoldens(t testing.TB, out, goldenName string) {
if os.IsNotExist(err) {
expected = []byte("ERR_FILE_NOT_FOUND:" + goldenPath)
} else {
require.NoError(t, err)
Check(t, err)
}
}
if diff := cmp.Diff(string(expected), out); diff != "" {
@ -367,7 +380,7 @@ func CompareGoldens(t testing.TB, out, goldenName string) {
_, filename, line, _ := runtime.Caller(1)
t.Fatalf("hishtory golden mismatch for %s at %s:%d (-expected +got):\n%s\nactual=\n%s", goldenName, filename, line, diff, out)
} else {
require.NoError(t, os.WriteFile(goldenPath, []byte(out), 0644))
Check(t, os.WriteFile(goldenPath, []byte(out), 0644))
}
}
}