Fix autopkgtest tests, extending the current test setup to mangle the shared configuration file appropriately for each test context (autopkgtest & boottest).

britney.conf

@@ -62,7 +62,7 @@ SMOOTH_UPDATES    = badgers
 
 REMOVE_OBSOLETE   = no
 
-ADT_ENABLE        = no
+ADT_ENABLE        = yes
 ADT_DEBUG         = no
 ADT_ARCHES        = amd64 i386
 

tests/test_autopkgtest.py

@@ -31,6 +31,16 @@ class TestAutoPkgTest(TestBase):
     def setUp(self):
         super(TestAutoPkgTest, self).setUp()
 
+        # Mofify configuration according to the test context.
+        self.old_config = None
+        with open(self.britney_conf, 'r') as fp:
+            self.old_config = fp.read()
+        # Disable boottests.
+        config = self.old_config.replace(
+            'BOOTTEST_ENABLE   = yes', 'BOOTTEST_ENABLE   = no')
+        with open(self.britney_conf, 'w') as fp:
+            fp.write(config)
+
         # fake adt-britney script
         self.adt_britney = os.path.join(
             self.data.home, 'auto-package-testing', 'jenkins', 'adt-britney')
@@ -53,6 +63,12 @@ echo "$@" >> /%s/adt-britney.log ''' % self.data.path)
                                       'Conflicts': 'green'})
         self.data.add('justdata', False, {'Architecture': 'all'})
 
+    def tearDown(self):
+        """Replace the old_config."""
+        with open(self.britney_conf, 'w') as fp:
+            fp.write(self.old_config)
+        super(TestAutoPkgTest, self).tearDown()
+
     def __merge_records(self, results, history=""):
         '''Merges a list of results with records in history.
 

tests/test_boottest.py

@@ -117,11 +117,10 @@ class TestBoottestEnd2End(TestBase):
 
     def setUp(self):
         super(TestBoottestEnd2End, self).setUp()
-        self.britney_conf = os.path.join(
+        self.old_config = None
-            PROJECT_DIR, 'britney.conf')
-        old_config = None
         with open(self.britney_conf, 'r') as fp:
             self.old_config = fp.read()
+        # Disable autopkgtests.
         config = self.old_config.replace(
             'ADT_ENABLE        = yes', 'ADT_ENABLE        = no')
         # Disable TouchManifest auto-fetching.
@@ -151,6 +150,7 @@ class TestBoottestEnd2End(TestBase):
         """ Replace the old_config. """
         with open(self.britney_conf, 'w') as fp:
             fp.write(self.old_config)
+        super(TestBoottestEnd2End, self).tearDown()
 
     def create_manifest(self, lines):
         """Create a manifest for this britney run context."""