Revert "another attempt to fix specs in CI"

This reverts commit 0141acb.

lib/mailmanager.rb

@@ -7,24 +7,6 @@
 require 'mailmanager/lib'
 require 'mailmanager/list'
 
-# Add a method to destroy the MailManager::Base singleton
-# so tests have a clean slate each time.
-# Found this here: http://blog.ardes.com/2006/12/11/testing-singletons-with-ruby
-require 'singleton'
-class <<Singleton
-  def included_with_reset(klass)
-    included_without_reset(klass)
-    class <<klass
-      def reset_instance
-        Singleton.send :__init__, self
-        self
-      end
-    end
-  end
-  alias_method :included_without_reset, :included
-  alias_method :included, :included_with_reset
-end
-
 module MailManager
   @root = nil
   @python = '/usr/bin/env python'
@@ -75,12 +57,6 @@ def initialize #:nodoc:
       @lib = MailManager::Lib.new
     end
 
-    # Need this because w/o it, the singleton pattern makes the tests
-    # leak side-effects across from test-to-test
-    # def destroy! #:nodoc:
-    #   @lib = nil
-    # end
-
     # If you want to use a non-default python executable to run the Python
     # portions of this gem, set its full path here. Since we require Python
     # 2.6+ and some distros don't ship with that version, you can point this at

spec/lib/mailmanager_spec.rb

@@ -42,7 +42,7 @@
         after :each do
           # since subject is a singleton, side-effects of tests will leak unless
           # we destroy and re-create it every test
-          MailManager::Base.reset_instance
+          subject = nil
         end
 
         it "should raise an error if one of the bin files is missing" do