diff options
| -rw-r--r-- | paludis/repositories/e/e_repository_TEST.cc | 78 | ||||
| -rwxr-xr-x | paludis/repositories/e/e_repository_TEST_setup.sh | 114 |
2 files changed, 24 insertions, 168 deletions
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc index 59082f207..c9dc9ea90 100644 --- a/paludis/repositories/e/e_repository_TEST.cc +++ b/paludis/repositories/e/e_repository_TEST.cc @@ -2012,18 +2012,9 @@ namespace test_cases } { - TestMessageSuffix suffix("herebin fail missing argument", true); + TestMessageSuffix suffix("herebin fail", true); const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("cat/herebin-argument-fail", - &env, UserPackageDepSpecOptions()))))]->last()); - TEST_CHECK(id); - TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); - } - - { - TestMessageSuffix suffix("herebin fail missing input", true); - const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("=cat/herebin-input-fail-1", + PackageDepSpec(parse_user_package_dep_spec("cat/herebin-fail", &env, UserPackageDepSpecOptions()))))]->last()); TEST_CHECK(id); TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); @@ -2039,18 +2030,9 @@ namespace test_cases } { - TestMessageSuffix suffix("hereconfd fail missing argument", true); + TestMessageSuffix suffix("hereconfd fail", true); const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-argument-fail", - &env, UserPackageDepSpecOptions()))))]->last()); - TEST_CHECK(id); - TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); - } - - { - TestMessageSuffix suffix("hereconfd fail missing input", true); - const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("=cat/hereconfd-input-fail-1", + PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-fail", &env, UserPackageDepSpecOptions()))))]->last()); TEST_CHECK(id); TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); @@ -2066,18 +2048,9 @@ namespace test_cases } { - TestMessageSuffix suffix("hereenvd fail missing argument", true); - const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-argument-fail", - &env, UserPackageDepSpecOptions()))))]->last()); - TEST_CHECK(id); - TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); - } - - { - TestMessageSuffix suffix("hereenvd fail missing input", true); + TestMessageSuffix suffix("hereenvd fail", true); const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("=cat/hereenvd-input-fail-1", + PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-fail", &env, UserPackageDepSpecOptions()))))]->last()); TEST_CHECK(id); TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); @@ -2093,18 +2066,9 @@ namespace test_cases } { - TestMessageSuffix suffix("hereinitd fail missing argument", true); + TestMessageSuffix suffix("hereinitd fail", true); const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-argument-fail", - &env, UserPackageDepSpecOptions()))))]->last()); - TEST_CHECK(id); - TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); - } - - { - TestMessageSuffix suffix("hereinitd fail missing input", true); - const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("=cat/hereinitd-input-fail-1", + PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-fail", &env, UserPackageDepSpecOptions()))))]->last()); TEST_CHECK(id); TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); @@ -2120,18 +2084,9 @@ namespace test_cases } { - TestMessageSuffix suffix("hereins fail missing argument", true); + TestMessageSuffix suffix("hereins fail", true); const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("cat/hereins-argument-fail", - &env, UserPackageDepSpecOptions()))))]->last()); - TEST_CHECK(id); - TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); - } - - { - TestMessageSuffix suffix("hereins fail missing input", true); - const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("=cat/hereins-input-fail-1", + PackageDepSpec(parse_user_package_dep_spec("cat/hereins-fail", &env, UserPackageDepSpecOptions()))))]->last()); TEST_CHECK(id); TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); @@ -2147,18 +2102,9 @@ namespace test_cases } { - TestMessageSuffix suffix("heresbin fail missing argument", true); - const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-argument-fail", - &env, UserPackageDepSpecOptions()))))]->last()); - TEST_CHECK(id); - TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); - } - - { - TestMessageSuffix suffix("heresbin fail missing input", true); + TestMessageSuffix suffix("heresbin fail", true); const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches( - PackageDepSpec(parse_user_package_dep_spec("=cat/heresbin-input-fail-1", + PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-fail", &env, UserPackageDepSpecOptions()))))]->last()); TEST_CHECK(id); TEST_CHECK_THROWS(id->perform_action(action), InstallActionError); diff --git a/paludis/repositories/e/e_repository_TEST_setup.sh b/paludis/repositories/e/e_repository_TEST_setup.sh index 26b575e3b..25201c0c0 100755 --- a/paludis/repositories/e/e_repository_TEST_setup.sh +++ b/paludis/repositories/e/e_repository_TEST_setup.sh @@ -1662,23 +1662,8 @@ blah EOF } END -mkdir -p "packages/cat/herebin-argument-fail" -cat <<END > packages/cat/herebin-argument-fail/herebin-argument-fail-1.ebuild || exit 1 -DESCRIPTION="The Long Description" -SUMMARY="The Short Description" -HOMEPAGE="http://example.com/" -DOWNLOADS="" -SLOT="0" -MYOPTIONS="spork" -LICENCES="GPL-2" -PLATFORMS="test" - -src_install() { - herebin monkey -} -END -mkdir -p "packages/cat/herebin-input-fail" -cat <<END > packages/cat/herebin-input-fail/herebin-input-fail-1.ebuild || exit 1 +mkdir -p "packages/cat/herebin-fail" +cat <<END > packages/cat/herebin-fail/herebin-fail-1.ebuild || exit 1 DESCRIPTION="The Long Description" SUMMARY="The Short Description" HOMEPAGE="http://example.com/" @@ -1711,23 +1696,8 @@ blah EOF } END -mkdir -p "packages/cat/hereconfd-argument-fail" -cat <<END > packages/cat/hereconfd-argument-fail/hereconfd-argument-fail-1.ebuild || exit 1 -DESCRIPTION="The Long Description" -SUMMARY="The Short Description" -HOMEPAGE="http://example.com/" -DOWNLOADS="" -SLOT="0" -MYOPTIONS="spork" -LICENCES="GPL-2" -PLATFORMS="test" - -src_install() { - hereconfd monkey -} -END -mkdir -p "packages/cat/hereconfd-input-fail" -cat <<END > packages/cat/hereconfd-input-fail/hereconfd-input-fail-1.ebuild || exit 1 +mkdir -p "packages/cat/hereconfd-fail" +cat <<END > packages/cat/hereconfd-fail/hereconfd-fail-1.ebuild || exit 1 DESCRIPTION="The Long Description" SUMMARY="The Short Description" HOMEPAGE="http://example.com/" @@ -1760,23 +1730,8 @@ blah EOF } END -mkdir -p "packages/cat/hereenvd-argument-fail" -cat <<END > packages/cat/hereenvd-argument-fail/hereenvd-argument-fail-1.ebuild || exit 1 -DESCRIPTION="The Long Description" -SUMMARY="The Short Description" -HOMEPAGE="http://example.com/" -DOWNLOADS="" -SLOT="0" -MYOPTIONS="spork" -LICENCES="GPL-2" -PLATFORMS="test" - -src_install() { - hereenvd monkey -} -END -mkdir -p "packages/cat/hereenvd-input-fail" -cat <<END > packages/cat/hereenvd-input-fail/hereenvd-input-fail-1.ebuild || exit 1 +mkdir -p "packages/cat/hereenvd-fail" +cat <<END > packages/cat/hereenvd-fail/hereenvd-fail-1.ebuild || exit 1 DESCRIPTION="The Long Description" SUMMARY="The Short Description" HOMEPAGE="http://example.com/" @@ -1809,23 +1764,8 @@ blah EOF } END -mkdir -p "packages/cat/hereinitd-argument-fail" -cat <<END > packages/cat/hereinitd-argument-fail/hereinitd-argument-fail-1.ebuild || exit 1 -DESCRIPTION="The Long Description" -SUMMARY="The Short Description" -HOMEPAGE="http://example.com/" -DOWNLOADS="" -SLOT="0" -MYOPTIONS="spork" -LICENCES="GPL-2" -PLATFORMS="test" - -src_install() { - hereinitd monkey -} -END -mkdir -p "packages/cat/hereinitd-input-fail" -cat <<END > packages/cat/hereinitd-input-fail/hereinitd-input-fail-1.ebuild || exit 1 +mkdir -p "packages/cat/hereinitd-fail" +cat <<END > packages/cat/hereinitd-fail/hereinitd-fail-1.ebuild || exit 1 DESCRIPTION="The Long Description" SUMMARY="The Short Description" HOMEPAGE="http://example.com/" @@ -1858,23 +1798,8 @@ blah EOF } END -mkdir -p "packages/cat/hereins-argument-fail" -cat <<END > packages/cat/hereins-argument-fail/hereins-argument-fail-1.ebuild || exit 1 -DESCRIPTION="The Long Description" -SUMMARY="The Short Description" -HOMEPAGE="http://example.com/" -DOWNLOADS="" -SLOT="0" -MYOPTIONS="spork" -LICENCES="GPL-2" -PLATFORMS="test" - -src_install() { - hereins monkey -} -END -mkdir -p "packages/cat/hereins-input-fail" -cat <<END > packages/cat/hereins-input-fail/hereins-input-fail-1.ebuild || exit 1 +mkdir -p "packages/cat/hereins-fail" +cat <<END > packages/cat/hereins-fail/hereins-fail-1.ebuild || exit 1 DESCRIPTION="The Long Description" SUMMARY="The Short Description" HOMEPAGE="http://example.com/" @@ -1907,23 +1832,8 @@ blah EOF } END -mkdir -p "packages/cat/heresbin-argument-fail" -cat <<END > packages/cat/heresbin-argument-fail/heresbin-argument-fail-1.ebuild || exit 1 -DESCRIPTION="The Long Description" -SUMMARY="The Short Description" -HOMEPAGE="http://example.com/" -DOWNLOADS="" -SLOT="0" -MYOPTIONS="spork" -LICENCES="GPL-2" -PLATFORMS="test" - -src_install() { - heresbin monkey -} -END -mkdir -p "packages/cat/heresbin-input-fail" -cat <<END > packages/cat/heresbin-input-fail/heresbin-input-fail-1.ebuild || exit 1 +mkdir -p "packages/cat/heresbin-fail" +cat <<END > packages/cat/heresbin-fail/heresbin-fail-1.ebuild || exit 1 DESCRIPTION="The Long Description" SUMMARY="The Short Description" HOMEPAGE="http://example.com/" |