Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2098835
Add a test about upgrading and remove false positive warnings
Baptiste Daroussin committed 11 years ago
commit 2098835efc66ba3c27a13c84b1b67dafe5bfcc4b
parent f7f3f69
2 files changed +23 -11
modified libpkg/pkg_solve.c
@@ -522,8 +522,6 @@ pkg_solve_add_require_rule(struct pkg_solve_problem *problem,
		 */

		pkg_debug(1, "solver: cannot find provide for requirement: %s",

		    requirement);
- 
		pkg_emit_error("Solver: cannot find a provide for requirement:"
- 
		    "    %s", requirement);

	}



	return (EPKG_OK);
modified tests/frontend/php-pr.shin
@@ -256,21 +256,35 @@ Installed packages to be UPGRADED:


Installed packages to be REINSTALLED:

	php53-extensions-1.6 (requires changed)
- 
${JAILED}[1/4] Upgrading php53 from 5.3.27 to 5.3.40...
- 
${JAILED}[1/4] Extracting php53-5.3.40... done
- 
${JAILED}[2/4] Upgrading php53-gd from 5.3.27 to 5.3.40...
- 
${JAILED}[2/4] Extracting php53-gd-5.3.40... done
- 
${JAILED}[3/4] Installing php53-fileinfo-5.3.40...
- 
${JAILED}[3/4] Extracting php53-fileinfo-5.3.40... done
- 
${JAILED}[4/4] Reinstalling php53-extensions-1.6...
- 
${JAILED}[4/4] Extracting php53-extensions-1.6... done

"



	atf_check \

		-o inline:"${OUTPUT}" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y php53-fileinfo
+ 
		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -n php53-fileinfo
+
+
+ 
OUTPUT="Updating local repository catalogue...
+ 
local repository is up-to-date.
+ 
All repositories are up-to-date.
+ 
Checking for upgrades (3 candidates)... done
+ 
Processing candidates (3 candidates)... done
+ 
Checking integrity... done (0 conflicting)
+ 
The following 3 package(s) will be affected (of 0 checked):
+
+ 
Installed packages to be UPGRADED:
+ 
	php53-gd: 5.3.27 -> 5.3.40
+ 
	php53: 5.3.27 -> 5.3.40
+
+ 
Installed packages to be REINSTALLED:
+ 
	php53-extensions-1.6 (requires changed)
+ 
"
+ 
	atf_check \
+ 
		-o inline:"${OUTPUT}" \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -n

}



atf_init_test_cases() {