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

Add more precise assertions for update tests

Browse Source
This commit is contained in:
David Dworken 2023-10-10 07:43:37 -07:00
parent 8373c589ea
commit dfa961072e
No known key found for this signature in database
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/client_test.go
View File

@ -547,7 +547,7 @@ func installFromPrev(t *testing.T, tester shellTester) (string, string) {
os.Setenv("HISHTORY_FORCE_CLIENT_VERSION", previousVersion.String()) os.Setenv("HISHTORY_FORCE_CLIENT_VERSION", previousVersion.String())
userSecret := installHishtory(t, tester, "") userSecret := installHishtory(t, tester, "")
out := tester.RunInteractiveShell(t, ` hishtory update`) out := tester.RunInteractiveShell(t, ` hishtory update`)
require.Regexp(t, regexp.MustCompile(`Successfully updated hishtory from v0[.]Unknown to `+previousVersion.String()), out) require.Regexp(t, regexp.MustCompile(`^Successfully updated hishtory from v0[.]Unknown to `+previousVersion.String()+`\n$`), out)
return userSecret, previousVersion.String() return userSecret, previousVersion.String()
} }
@ -557,14 +557,12 @@ func updateToRelease(t *testing.T, tester shellTester) string {
// Update // Update
out := tester.RunInteractiveShell(t, " hishtory update\necho postupdate") out := tester.RunInteractiveShell(t, " hishtory update\necho postupdate")
require.Regexp(t, regexp.MustCompile(`Successfully updated hishtory from v0[.][a-zA-Z0-9]+ to `+dd.Version), out) require.Regexp(t, regexp.MustCompile(`^Successfully updated hishtory from v0[.][a-zA-Z0-9]+ to `+dd.Version+`\npostupdate\n$`), out)
require.NotContains(t, out, "skipping SLSA validation") require.NotContains(t, out, "skipping SLSA validation")
// Update again and assert that it skipped the update // Update again and assert that it skipped the update
out = tester.RunInteractiveShell(t, " hishtory update") out = tester.RunInteractiveShell(t, " hishtory update")
if strings.Count(out, "\n") != 1 || !strings.Contains(out, "is already installed") { require.Equal(t, fmt.Sprintf("Latest version (%s) is already installed\n", dd.Version), out)
t.Fatalf("repeated hishtory update didn't skip the update, out=%#v", out)
}
return dd.Version return dd.Version
} }