Add output_match_clean_pkg_install().

Avoids duplication of this common check across tests.
TritonDataCenter · Jun 15, 2023 · 6075005 · 6075005
1 parent bbb3e8b
commit 6075005
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/suite/autoremove.bats b/suite/autoremove.bats
@@ -118,9 +118,7 @@ teardown_file()
 	run pkgin -y fug
 	[ ${status} -eq 0 ]
 
-	output_match "pkg_install warnings: 0, errors: 0"
-	output_not_match "pkg_install warnings: [1-9]"
-	output_not_match "pkg_install .*errors: [1-9]"
+	output_match_clean_pkg_install
 
 	# pkgin 22.9.0 has a bug where packages are not correctly marked as
 	# keep, and keep/unkeep do not work, so we need to do it manually to
@@ -153,9 +151,7 @@ teardown_file()
 
 		output_match "1 package.* to be autoremoved"
 		output_match "removing depend-1.0"
-		output_match "pkg_install warnings: 0, errors: 0"
-		output_not_match "pkg_install warnings: [1-9]"
-		output_not_match "pkg_install .*errors: [1-9]"
+		output_match_clean_pkg_install
 	fi
 }
 

diff --git a/suite/break-depends.bats b/suite/break-depends.bats
@@ -169,9 +169,7 @@ teardown_file()
 
 	output_match "7 package.* to.* install"
 	output_match "marking top-1.0 as non auto"
-	output_match "pkg_install warnings: 0, errors: 0"
-	output_not_match "pkg_install warnings: [1-9]"
-	output_not_match "pkg_install .*errors: [1-9]"
+	output_match_clean_pkg_install
 }
 
 @test "${SUITE} switch repository" {
@@ -214,9 +212,7 @@ teardown_file()
 	else
 		[ ${status} -eq 0 ]
 		output_not_match "package.* to.* remove"
-		output_match "pkg_install warnings: 0, errors: 0"
-		output_not_match "pkg_install warnings: [1-9]"
-		output_not_match "pkg_install .*errors: [1-9]"
+		output_match_clean_pkg_install
 	fi
 
 }

diff --git a/suite/common.bash b/suite/common.bash
@@ -531,6 +531,19 @@ file_match()
 	done < ${matchfile}
 	[ ${#lines[@]} -eq ${nl} ]
 }
+#
+# Common output matches
+#
+output_match_clean_pkg_install()
+{
+	#
+	# There are often multiple output lines so we need to check for both
+	# positive and negative matches.
+	#
+	output_match "pkg_install warnings: 0, errors: 0"
+	output_not_match "pkg_install warnings: [1-9]"
+	output_not_match "pkg_install .*errors: [1-9]"
+}
 
 #
 # Skip tests unsuitable for the current release.

diff --git a/suite/file-dl.bats b/suite/file-dl.bats
@@ -147,8 +147,8 @@ setup_file()
 	if [ ${PKGIN_VERSION} -lt 001101 -o ${PKGIN_VERSION} -eq 001600 ]; then
 		output_match "1 package.* to .* install"
 		output_match "installing download-ok-1.0"
-		output_match "pkg_install warnings: 0, errors: 0"
 		output_match "marking download-ok-1.0 as non auto-removable"
+		output_match_clean_pkg_install
 	else
 		file_match "download-install.regex"
 	fi

diff --git a/suite/http-dl.bats b/suite/http-dl.bats
@@ -160,8 +160,8 @@ teardown_file()
 	if [ ${PKGIN_VERSION} -lt 001101 -o ${PKGIN_VERSION} -eq 001600 ]; then
 		output_match "1 package.* to .* install"
 		output_match "download-ok-1.0"
-		output_match "pkg_install warnings: 0, errors: 0"
 		output_match "marking download-ok-1.0 as non auto-removable"
+		output_match_clean_pkg_install
 	else
 		file_match "download-install.regex"
 	fi

diff --git a/suite/install.bats b/suite/install.bats
@@ -188,7 +188,7 @@ teardown_file()
 	       ${PKGIN_VERSION} -eq 001600 ]; then
 		output_match "1 package.* install"
 		output_match "installing preserve-1.0"
-		output_match "pkg_install warnings: 0, errors: 0"
+		output_match_clean_pkg_install
 	else
 		file_match "install-against-empty.regex"
 	fi
@@ -226,9 +226,9 @@ teardown_file()
 
 	if [ ${PKGIN_VERSION} -lt 001300 -o ${PKGIN_VERSION} -eq 001600 ]; then
 		output_match "4 packages .* install"
-		output_match "pkg_install warnings: 0, errors: 0"
 		output_match "marking pkgpath-1.0 as non auto-removable"
 		output_match "marking deptree-top-1.0 as non auto-removable"
+		output_match_clean_pkg_install
 	else
 		# Non-deterministic output ordering.
 		file_match -I "install-remaining.regex"

diff --git a/suite/upgrade.bats b/suite/upgrade.bats
@@ -286,16 +286,14 @@ teardown_file()
 			output_match "installing refresh-1.0..."
 		fi
 		output_match "installing upgrade-2.0..."
-		output_match "pkg_install warnings: 0, errors: 0"
-		output_not_match "pkg_install warnings: [1-9], errors: [1-9]"
+		output_match_clean_pkg_install
 	elif [ ${PKGIN_VERSION} -le 200501 ]; then
 		output_match "refreshing refresh-1.0..."
 		output_match "upgrading deptree-bottom-2.0..."
 		output_match "upgrading deptree-top-2.0..."
 		output_match "upgrading upgrade-2.0..."
 		output_match "installing deptree-middle-2.0..."
-		output_match "pkg_install warnings: 0, errors: 0"
-		output_not_match "pkg_install warnings: [1-9], errors: [1-9]"
+		output_match_clean_pkg_install
 	else
 		file_match "full-upgrade.regex"
 	fi
@@ -387,13 +385,11 @@ teardown_file()
 		output_match "1 package.* to be installed"
 		output_match "removing pkgpath-1.0..."
 		output_match "installing pkgpath-2.0..."
-		output_match "pkg_install warnings: 0, errors: 0"
-		output_not_match "pkg_install warnings: [1-9], errors: [1-9]"
+		output_match_clean_pkg_install
 	elif [ ${PKGIN_VERSION} -eq 001600 ]; then
 		output_match "1 package to upgrade"
 		output_match "upgrading pkgpath-2.0..."
-		output_match "pkg_install warnings: 0, errors: 0"
-		output_not_match "pkg_install warnings: [1-9], errors: [1-9]"
+		output_match_clean_pkg_install
 	else
 		file_match "install-pkgpath-upgrade.regex"
 	fi