Be more tolerant of apt-cache warnings.

awalsh128 · Nov 27, 2023 · 19a0253 · 19a0253
1 parent 45e4578
commit 19a0253
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/apt_query.go b/apt_query.go
@@ -65,7 +65,7 @@ func getPackages(names []string) AptPackages {
 				pkg.Name = strings.TrimSpace(strings.Split(line, ":")[1])
 			} else if strings.HasPrefix(line, "Version: ") {
 				pkg.Version = strings.TrimSpace(strings.Split(line, ":")[1])
-			} else if strings.HasPrefix(line, "N: ") || strings.HasPrefix(line, "E: ") {
+			} else if strings.HasPrefix(line, "N: Unable to locate package ") || strings.HasPrefix(line, "E: ") {
 				if !contains(errorMessages, line) {
 					errorMessages = append(errorMessages, line)
 				}

diff --git a/apt_query_test.go b/apt_query_test.go
@@ -28,6 +28,9 @@ func (r *RunResult) expectSuccessfulOut(expected string) {
 		r.TestContext.Errorf("Error running command: %v", r.Err)
 		return
 	}
+	if 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.
 		r.TestContext.Errorf("Unexpected stdout found.\nExpected:\n'%s'\nActual:\n'%s'", expected, r.Stdout)
 	}