[Aptitude-svn-commit] r3966 - in branches/aptitude-0.3/aptitude: . tests

[Daniel Burrows]

Author: dburrows
Date: Fri Aug 26 04:01:06 2005
New Revision: 3966

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
Log:
Add more diagnostic information to the connectivity tester.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Aug 26 04:01:06 2005
@@ -1,5 +1,9 @@
 2005-08-25  Daniel Burrows  <dburrows at debian.org>
 
+	* tests/test_apt_universe.cc:
+
+	  Add more diagnostic information to the connectivity tester.
+
 	* src/generic/apt.cc:
 
 	  Fix the behavior of is_interesting_dep on reverse dependencies:

Modified: branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	Fri Aug 26 04:01:06 2005
@@ -249,6 +249,28 @@
 	    << ":" << (pkgCache::Provides *) (*rdi).get_prv() << ")"
 	    << std::endl;
       }
+
+    if(v.get_ver().end())
+      return;
+
+    out << "Low-level reverse dependencies of "
+	<< v.get_package().get_name() << " "
+	<< v.get_name() << " are:" << std::endl;
+
+    for(pkgCache::DepIterator d = v.get_pkg().RevDependsList();
+	!d.end(); ++d)
+      {
+	out << d.ParentPkg().Name() << " " << d.ParentVer().VerStr()
+	    << " " << d.DepType() << " " << d.TargetPkg().Name();
+
+	if(d.TargetVer() != NULL)
+	  out << "(" << d.CompType() << " " << d.TargetVer() << ")";
+
+	if(is_interesting_dep(d, *apt_cache_file))
+	  out << "[INTERESTING]";
+
+	out << std::endl;
+      }
   }
 
   void testReverseConnectivity()
@@ -266,6 +288,14 @@
       for(aptitude_universe::dep::solver_iterator si
 	    = (*di).solvers_begin(); !si.end(); ++si)
 	{
+	  if(!is_interesting_dep((*di).get_dep(), *apt_cache_file))
+	    {
+	      std::ostringstream out;
+	      out << "Encountered uninteresting dep:"
+		  << *di;
+	      CPPUNIT_FAIL(out.str());
+	    }
+
 	  if(!(*di).solved_by(*si))
 	    {
 	      std::ostringstream out;