Using a setting for configuring queueing

Removing class methods and such, and switching to
relying solely on a setting for the queue configuration.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 5 insertions, 12 deletions

diff --git a/spec/unit/indirector/queue.rb b/spec/unit/indirector/queue.rb
index de9a27fb2..0e9074440 100755
--- a/spec/unit/indirector/queue.rb
+++ b/spec/unit/indirector/queue.rb
@@ -46,7 +46,7 @@ describe Puppet::Indirector::Queue do
         @subject.name = :me
 
         Puppet.settings.stubs(:value).returns("bogus setting data")
-        Puppet.settings.stubs(:value).with(:queue_client).returns(:test_client)
+        Puppet.settings.stubs(:value).with(:queue_type).returns(:test_client)
         Puppet::Util::Queue.stubs(:queue_type_to_class).with(:test_client).returns(Puppet::Indirector::Queue::TestClient)
         Puppet::Indirector::Queue::TestClient.reset
 
diff --git a/spec/unit/util/queue.rb b/spec/unit/util/queue.rb
index 525e6239f..19af9430e 100755
--- a/spec/unit/util/queue.rb
+++ b/spec/unit/util/queue.rb
@@ -26,7 +26,6 @@ describe Puppet::Util::Queue do
     before :each do
         @class = Class.new do
             extend mod
-            self.queue_type_default = :default
         end
     end
 
@@ -80,16 +79,10 @@ describe Puppet::Util::Queue do
     end
 
     context 'when determining client type' do
-        it 'returns client class based on queue_type_default' do
-            Puppet.settings.stubs(:value).returns(nil)
-            @class.client_class.should == client_classes[:default]
-            @class.client.class.should == client_classes[:default]
-        end
-
-        it 'prefers settings variable for client class when specified' do
-            Puppet.settings.stubs(:value).with(:queue_client).returns(:setup)
-            @class.client_class.should == client_classes[:setup]
-            @class.client.class.should == client_classes[:setup]
+        it 'returns client class based on the :queue_type setting' do
+            Puppet.settings.expects(:value).with(:queue_type).returns(:myqueue)
+            Puppet::Util::Queue.expects(:queue_type_to_class).with(:myqueue).returns "eh"
+            @class.client_class.should == "eh"
         end
     end
 end