aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-11-16 23:20:39 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-11-16 23:20:39 +0000
commit1d3657b11b604d59255a4d1eb36c4f858a689824 (patch)
tree46fa55666c95790864b752ee94f9b06a5837cef8
parent35d31ee2fa13358f20b2a75b67666b78956ae03b (diff)
downloadpaludis-1d3657b11b604d59255a4d1eb36c4f858a689824.tar.gz
paludis-1d3657b11b604d59255a4d1eb36c4f858a689824.tar.xz
Fix test fails
-rw-r--r--paludis/repositories/e/depend_rdepend_TEST.cc6
-rw-r--r--paludis/repositories/e/e_repository_TEST_5.cc4
-rwxr-xr-xpython/package_id_TEST.py4
-rw-r--r--ruby/package_id_TEST.rb2
4 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index 0a7f6e3..b85100b 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2012 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -138,7 +138,7 @@ TEST_P(DependRdependTest, Works)
if (special)
EXPECT_EQ("the/depend", id->run_dependencies_key()->pretty_print_value(UnformattedPrettyPrinter(), { }));
else
- EXPECT_EQ("", id->run_dependencies_key()->pretty_print_value(UnformattedPrettyPrinter(), { }));
+ EXPECT_FALSE(id->run_dependencies_key());
id->perform_action(action);
@@ -159,7 +159,7 @@ TEST_P(DependRdependTest, Works)
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "ronly")))]->begin());
- EXPECT_EQ("", id->build_dependencies_key()->pretty_print_value(UnformattedPrettyPrinter(), { }));
+ EXPECT_FALSE(id->build_dependencies_key());
EXPECT_EQ("the/rdepend", id->run_dependencies_key()->pretty_print_value(UnformattedPrettyPrinter(), { }));
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_5.cc b/paludis/repositories/e/e_repository_TEST_5.cc
index 272df7b..68e0db5 100644
--- a/paludis/repositories/e/e_repository_TEST_5.cc
+++ b/paludis/repositories/e/e_repository_TEST_5.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -381,7 +381,7 @@ TEST(ERepository, SubSlots)
&env, { })), make_null_shared_ptr(), { }))]->last());
ASSERT_TRUE(bool(id));
EXPECT_EQ("5", visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->parse_value());
- EXPECT_EQ("cat/subslots:=foo/bar cat/subslots:foo=foo/bar", id->build_dependencies_key()->pretty_print_value(UnformattedPrettyPrinter(), { }));
+ EXPECT_EQ("cat/subslots:foo/bar= cat/subslots:foo/bar=", id->build_dependencies_key()->pretty_print_value(UnformattedPrettyPrinter(), { }));
}
}
}
diff --git a/python/package_id_TEST.py b/python/package_id_TEST.py
index 467672f..0c652b1 100755
--- a/python/package_id_TEST.py
+++ b/python/package_id_TEST.py
@@ -110,11 +110,11 @@ class TestCase_01_PackageID(unittest.TestCase):
self.assertEquals(self.ipid.build_dependencies_key(), None)
def test_19_run_dependencies_key(self):
- self.assert_(isinstance(self.pid.run_dependencies_key(), MetadataDependencySpecTreeKey))
+ self.assertEquals(self.pid.run_dependencies_key(), None)
self.assertEquals(self.ipid.run_dependencies_key(), None)
def test_20_post_dependencies_key(self):
- self.assert_(isinstance(self.pid.post_dependencies_key(), MetadataDependencySpecTreeKey))
+ self.assertEquals(self.pid.post_dependencies_key(), None)
self.assertEquals(self.ipid.post_dependencies_key(), None)
def test_22_fetches_key(self):
diff --git a/ruby/package_id_TEST.rb b/ruby/package_id_TEST.rb
index ebe57f3..0215af2 100644
--- a/ruby/package_id_TEST.rb
+++ b/ruby/package_id_TEST.rb
@@ -155,7 +155,7 @@ module Paludis
def test_each_metadata
keys = { "DESCRIPTION" => 1, "INHERITED" => 1, "KEYWORDS" => 1, "EAPI" => 1,
- "DEPEND" => 1, "RDEPEND" => 1, "PDEPEND" => 1, "LICENSE" => 1,
+ "DEPEND" => 1, "LICENSE" => 1,
"RESTRICT" => 1, "SRC_URI" => 1, "HOMEPAGE" => 1, "EBUILD" => 1, "IUSE" => 1,
"PALUDIS_CHOICES" => 1, "DEFINED_PHASES" => 1, "SLOT" => 1 }
pid_testrepo.each_metadata do | key |