Make Heidi optional.

britney.conf

@@ -66,7 +66,7 @@ REMOVE_OBSOLETE   = no
 ADT_ENABLE        = yes
 ADT_DEBUG         = no
 ADT_ARCHES        = amd64 i386 armhf ppc64el
-ADT_AMQP          = amqp://test_request:password@162.213.33.228
+ADT_AMQP          = amqp://localhost
 # Swift base URL with the results (must be publicly readable and browsable)
 ADT_SWIFT_URL     = https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac
 # space separate list of PPAs to add for test requests and for polling results;

britney.py

@@ -453,7 +453,7 @@ class Britney(object):
                          not getattr(self.options, k.lower()):
                         setattr(self.options, k.lower(), v)
 
-        if not hasattr(self.options, "heidi_delta_output"):
+        if self.options.heidi_output and not hasattr(self.options, "heidi_delta_output"):
             self.options.heidi_delta_output = self.options.heidi_output + "Delta"
 
         self.options.nobreakall_arches = self.options.nobreakall_arches.split()
@@ -3023,14 +3023,15 @@ class Britney(object):
             except AttributeError:
                 self.write_dates(self.options.testing, self.dates)
 
-            # write HeidiResult
+            if self.options.heidi_output:
-            self.__log("Writing Heidi results to %s" % self.options.heidi_output)
+                # write HeidiResult
-            write_heidi(self.options.heidi_output, self.sources["testing"],
+                self.__log("Writing Heidi results to %s" % self.options.heidi_output)
-                        self.binaries["testing"])
+                write_heidi(self.options.heidi_output, self.sources["testing"],
+                            self.binaries["testing"])
 
-            self.__log("Writing delta to %s" % self.options.heidi_delta_output)
+                self.__log("Writing delta to %s" % self.options.heidi_delta_output)
-            write_heidi_delta(self.options.heidi_delta_output,
+                write_heidi_delta(self.options.heidi_delta_output,
-                              self.all_selected)
+                                  self.all_selected)
 
 
         self.printuninstchange()