actions/cache-apt-pkgs-action
1
0
Fork 0
mirror of https://github.com/awalsh128/cache-apt-pkgs-action.git synced 2025-09-20 18:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for colons in version value.

Browse source
This commit is contained in:
Andrew Walsh 2023-11-26 21:26:22 -08:00
parent 19a0253e65
commit 7c7bcedcc5
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apt_query.go
View file

@ -62,10 +62,10 @@ func getPackages(names []string) AptPackages {
pkg := AptPackage{} pkg := AptPackage{}
for _, line := range strings.Split(paragraph, "\n") { for _, line := range strings.Split(paragraph, "\n") {
if strings.HasPrefix(line, "Package: ") { if strings.HasPrefix(line, "Package: ") {
pkg.Name = strings.TrimSpace(strings.Split(line, ":")[1]) pkg.Name = strings.TrimSpace(strings.SplitN(line, ":", 2)[1])
} else if strings.HasPrefix(line, "Version: ") { } else if strings.HasPrefix(line, "Version: ") {
pkg.Version = strings.TrimSpace(strings.Split(line, ":")[1]) pkg.Version = strings.TrimSpace(strings.SplitN(line, ":", 2)[1])
} else if strings.HasPrefix(line, "N: Unable to locate package ") || strings.HasPrefix(line, "E: ") { } else if strings.HasPrefix(line, "N: ") || strings.HasPrefix(line, "E: ") {
if !contains(errorMessages, line) { if !contains(errorMessages, line) {
errorMessages = append(errorMessages, line) errorMessages = append(errorMessages, line)
} }

15
apt_query_test.go
View file

@ -31,14 +31,16 @@ func (r *RunResult) expectSuccessfulOut(expected string) {
if r.Stderr != "" { if r.Stderr != "" {
r.TestContext.Errorf("Unexpected stderr messages found.\nExpected: none\nActual:\n'%s'", r.Stderr) r.TestContext.Errorf("Unexpected stderr messages found.\nExpected: none\nActual:\n'%s'", r.Stderr)
} }
if r.Stdout != expected+"\n" { // Output will always have a end of output newline. fullExpected := expected + "\n" // Output will always have a end of output newline.
r.TestContext.Errorf("Unexpected stdout found.\nExpected:\n'%s'\nActual:\n'%s'", expected, r.Stdout) if r.Stdout != fullExpected { // Output will always have a end of output newline.
r.TestContext.Errorf("Unexpected stdout found.\nExpected:\n'%s'\nActual:\n'%s'", fullExpected, r.Stdout)
} }
} }
func (r *RunResult) expectError(expected string) { func (r *RunResult) expectError(expected string) {
if r.Stderr != expected+"\n" { // Output will always have a end of output newline. fullExpected := expected + "\n" // Output will always have a end of output newline.
r.TestContext.Errorf("Unexpected stderr found.\nExpected:\n'%s'\nActual:\n'%s'", expected, r.Stderr) if r.Stderr != fullExpected {
r.TestContext.Errorf("Unexpected stderr found.\nExpected:\n'%s'\nActual:\n'%s'", fullExpected, r.Stderr)
} }
} }
@ -62,6 +64,11 @@ func TestNormalizedList_SinglePackageExists_StdoutsSinglePackageNameVersionPair(
result.expectSuccessfulOut("xdot=1.2-3") result.expectSuccessfulOut("xdot=1.2-3")
} }
func TestNormalizedList_VersionContainsColon_StdoutsEntireVersion(t *testing.T) {
var result = run(t, "normalized-list", "default-jre")
result.expectSuccessfulOut("default-jre=2:1.17-74")
}
func TestNormalizedList_NonExistentPackageName_StderrsAptCacheErrors(t *testing.T) { func TestNormalizedList_NonExistentPackageName_StderrsAptCacheErrors(t *testing.T) {
var result = run(t, "normalized-list", "nonexistentpackagename") var result = run(t, "normalized-list", "nonexistentpackagename")
result.expectError( result.expectError(