aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-05 21:38:46 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-05 23:32:57 +0100
commitdc567ead0ab97ef1aa3f50ec732ea10f3588fe67 (patch)
tree4c0afef5d945b54b4099c834d7bc10bc05be6338
parent47cef140e8948e4668fd58fc460b264b13750698 (diff)
downloadpaludis-dc567ead0ab97ef1aa3f50ec732ea10f3588fe67.tar.gz
paludis-dc567ead0ab97ef1aa3f50ec732ea10f3588fe67.tar.xz
Fix slightly broken tests.
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc16
-rwxr-xr-xpaludis/repositories/e/vdb_repository_TEST_setup.sh6
2 files changed, 11 insertions, 11 deletions
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 159cc5b..3dcf67b 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -612,11 +612,11 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::namesincrtest_src",
&env, UserPackageDepSpecOptions()))))]->begin());
+ id->perform_action(install_action);
+ vdb_repo->invalidate();
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
&env, UserPackageDepSpecOptions()))))]->begin());
- id->perform_action(install_action);
- vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -632,11 +632,11 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::namesincrtest_src",
&env, UserPackageDepSpecOptions()))))]->begin());
+ id->perform_action(install_action);
+ vdb_repo->invalidate();
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::installed",
&env, UserPackageDepSpecOptions()))))]->begin());
- id->perform_action(install_action);
- vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -959,11 +959,11 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::providesincrtest_src1",
&env, UserPackageDepSpecOptions()))))]->begin());
+ id->perform_action(install_action);
+ vdb_repo->invalidate();
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
&env, UserPackageDepSpecOptions()))))]->begin());
- id->perform_action(install_action);
- vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -986,11 +986,11 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::providesincrtest_src1",
&env, UserPackageDepSpecOptions()))))]->begin());
+ id->perform_action(install_action);
+ vdb_repo->invalidate();
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::installed",
&env, UserPackageDepSpecOptions()))))]->begin());
- id->perform_action(install_action);
- vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
diff --git a/paludis/repositories/e/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index fc93fe6..d4a0737 100755
--- a/paludis/repositories/e/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
@@ -371,7 +371,7 @@ echo cat2 >>namesincrtest_src/profiles/categories
cat <<END >namesincrtest_src/cat1/pkg1/pkg1-1.ebuild
KEYWORDS="test"
-SLOT="${PV:0:1}"
+SLOT="\${PV:0:1}"
END
cp namesincrtest_src/cat1/pkg1/pkg1-{1,1.1}.ebuild
cp namesincrtest_src/cat1/pkg1/pkg1-{1,2}.ebuild
@@ -416,7 +416,7 @@ echo cat1 >providesincrtest_src2/profiles/categories
cat <<END >providesincrtest_src1/cat1/pkg1/pkg1-1.ebuild
KEYWORDS="test"
-SLOT="${PV:0:1}"
+SLOT="\${PV:0:1}"
PROVIDE="enabled? ( virtual/foo ) disabled? ( virtual/bar )"
END
cp providesincrtest_src1/cat1/pkg1/pkg1-{1,1.1}.ebuild
@@ -426,7 +426,7 @@ cp providesincrtest_src1/cat1/pkg1/pkg1-1.1.ebuild providesincrtest_src2/cat1/pk
cat <<END >providesincrtest_src2/cat1/pkg1/pkg1-1.ebuild
KEYWORDS="test"
-SLOT="${PV:0:1}"
+SLOT="\${PV:0:1}"
PROVIDE="enabled? ( virtual/bar ) disabled? ( virtual/foo )"
END