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

[Daniel Burrows]

Author: dburrows
Date: Mon Aug 29 20:34:11 2005
New Revision: 3981

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
Log:
Load local test data.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Aug 29 20:34:11 2005
@@ -1,5 +1,9 @@
 2005-08-29  Daniel Burrows  <dburrows at debian.org>
 
+	* tests/test_apt_universe.cc:
+
+	  Actually load the local test data in the apt tests.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Eliminate the major bottleneck in the resolver code: rather than

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	Mon Aug 29 20:34:11 2005
@@ -20,6 +20,7 @@
 // A test of the aptitude universe wrapper.
 
 #include <src/generic/aptitude_resolver_universe.h>
+#include <src/generic/config_signal.h>
 
 #include <cppunit/extensions/HelperMacros.h>
 
@@ -40,15 +41,21 @@
 public:
   void setUp()
   {
-    // TODO: load information from a custom location
     apt_preinit();
 
     _error->Discard();
 
+    // These state locations are set up for the case of running the
+    // program from the 'tests' directory.
+    aptcfg->Set("Dir::Etc", "./data");
+    aptcfg->Set("Dir::State::Lists", "./data/lists");
+    aptcfg->Set("Dir::State::status", "./data/dpkg/status");
+    aptcfg->Set("Dir::Aptitude::state", "./data");
+
     OpProgress p;
     apt_init(&p, false);
 
-    _error->Discard();
+    _error->DumpErrors();
   }
 
   void tearDown()