mcollective-client 2.4.1 → 2.5.0.rc1

data/spec/unit/runner_spec.rb

@@ -0,0 +1,253 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+
+module MCollective
+  describe Runner do
+    let(:config) do
+      c = mock
+      c.stubs(:loadconfig)
+      c.stubs(:configured).returns(true)
+      c.stubs(:mode=)
+      c.stubs(:direct_addressing).returns(true)
+      c.stubs(:registerinterval).returns(1)
+      c.stubs(:soft_shutdown).returns(false)
+      c
+    end
+
+    let(:stats) { mock }
+
+    let(:security) do
+      s = mock
+      s.stubs(:initiated_by=)
+      s
+    end
+
+    let(:connector) do
+      c = mock
+      c.stubs(:connect)
+      c.stubs(:disconnect)
+      c
+    end
+
+    let(:agents) { mock }
+
+    let(:receiver_thread) do
+      rt = mock
+      rt
+    end
+
+    before :each do
+      Config.stubs(:instance).returns(config)
+      PluginManager.stubs(:[]).with('global_stats').returns(stats)
+      PluginManager.stubs(:[]).with('security_plugin').returns(security)
+      PluginManager.stubs(:[]).with('connector_plugin').returns(connector)
+      Agents.stubs(:new).returns(agents)
+    end
+
+    describe 'initialize' do
+      it 'should set up the signal handlers when not on windows' do
+        Util.stubs(:windows).returns(false)
+        Signal.expects(:trap).with('USR1')
+        Signal.expects(:trap).with('USR2')
+        Runner.new(nil)
+      end
+
+      it 'should not set up the signal handlers when on windows' do
+        Util.stubs(:windows?).returns(true)
+        Signal.expects(:trap).with('USR1').never
+        Signal.expects(:trap).with('USR2').never
+
+        Util.expects(:setup_windows_sleeper)
+        Runner.new(nil)
+      end
+
+      it 'should log a message when it cannot initialize the runner' do
+        Config.stubs(:instance).raises('failure')
+        Log.expects(:error).times(3)
+        expect {
+          Runner.new(nil)
+        }.to raise_error 'failure'
+      end
+    end
+
+    describe '#main_loop' do
+      let(:runner) do
+        Runner.new(nil)
+      end
+
+      let(:receiver_thread) do
+        rt = mock
+        rt.stubs(:alive?).returns(false)
+        rt
+      end
+
+      let(:agent_thread) do
+        at = mock
+        at.stubs(:alive?).returns(true)
+        at.expects(:join)
+        at
+      end
+
+      before :each do
+        Log.stubs(:debug)
+        Log.stubs(:info)
+        Log.stubs(:warn)
+        Log.stubs(:error)
+        runner.stubs(:start_receiver_thread).returns(receiver_thread)
+      end
+
+      context 'stopping' do
+        it 'should stop normally' do
+          receiver_thread.stubs(:alive?).returns(true)
+          runner.instance_variable_set(:@state, :stopping)
+          runner.expects(:stop_threads)
+          runner.main_loop
+        end
+
+        it 'should not do a soft_shutdown on windows' do
+          config.stubs(:soft_shutdown).returns(true)
+          Util.stubs(:windows?).returns(true)
+          Log.expects(:warn).with("soft_shutdown specified. This feature is not available on Windows. Shutting down normally.")
+          runner.instance_variable_set(:@state, :stopping)
+          runner.main_loop
+        end
+
+        it 'should do a soft_shutdown' do
+          config.stubs(:soft_shutdown).returns(true)
+          Util.stubs(:windows?).returns(false)
+          runner.instance_variable_set(:@state, :stopping)
+          runner.instance_variable_set(:@agent_threads, [agent_thread])
+          runner.main_loop
+        end
+      end
+
+      # Because paused is not a terminal state, we raise after testing pause
+      # which forces a run. This means checks like #stop_threads will happen twice
+      context 'pausing' do
+        before :each do
+          receiver_thread.stubs(:alive?).returns(false)
+        end
+
+        it 'should pause' do
+          runner.instance_variable_set(:@state, :pausing)
+          runner.expects(:stop_threads).twice
+          runner.expects(:sleep).with(0.1).raises("error")
+          runner.main_loop
+        end
+
+        it 'should resume' do
+          runner.instance_variable_set(:@state, :unpausing)
+          runner.expects(:stop_threads)
+          runner.expects(:start_receiver_thread).returns(receiver_thread)
+          runner.expects(:sleep).with(0.1).raises("error")
+          runner.main_loop
+        end
+      end
+    end
+
+    context 'action methods' do
+      let(:runner) do
+        Runner.new(nil)
+      end
+
+      describe '#stop' do
+        it 'should change the state to stopping' do
+          runner.instance_variable_set(:@state, :running)
+          runner.stop
+          runner.state.should == :stopping
+        end
+      end
+
+      describe '#pause' do
+        it 'should change the state to pausing' do
+          runner.instance_variable_set(:@state, :running)
+          runner.pause
+          runner.state.should == :pausing
+        end
+
+        it 'should fail if state is not running' do
+          Log.expects(:error).with('Cannot pause MCollective while not in a running state')
+          runner.pause
+        end
+      end
+
+      describe '#resume' do
+        it 'should change the state to unpausing' do
+          runner.instance_variable_set(:@state, :paused)
+          runner.resume
+          runner.state.should == :unpausing
+        end
+
+        it 'should fail if state is not paused' do
+          runner.instance_variable_set(:@state, :running)
+          Log.expects(:error).with('Cannot unpause MCollective when it is not paused')
+          runner.resume
+        end
+      end
+
+      describe '#receiver_thread' do
+        let(:runner) do
+          Runner.new(nil)
+        end
+
+        let(:registration_agent) do
+          ra = mock
+          ra.stubs(:run)
+          ra
+        end
+
+        let(:request) do
+          r = mock
+          r.stubs(:agent).returns("rspec")
+          r
+        end
+
+        before :each do
+          PluginManager.stubs(:[]).with("registration_plugin").returns(registration_agent)
+          Data.expects(:load_data_sources)
+          Util.expects(:subscribe).twice
+          Util.expects(:make_subscriptions).twice
+        end
+
+        it 'should receive a message and spawn an agent thread' do
+          runner.expects(:receive).returns(request)
+          runner.expects(:agentmsg).with(request)
+          runner.instance_variable_set(:@exit_receiver_thread, true)
+          runner.send(:receiver_thread)
+        end
+
+        it 'should discard controller messages with an error message' do
+          runner.expects(:receive).returns(request)
+          request.stubs(:agent).returns("mcollective")
+          Log.expects(:error).with("Received a control message, possibly via 'mco controller' but this has been deprecated and removed")
+          runner.instance_variable_set(:@exit_receiver_thread, true)
+          runner.send(:receiver_thread)
+        end
+
+        it 'should warn when a received message has expired' do
+          runner.expects(:receive).raises(MsgTTLExpired)
+          runner.instance_variable_set(:@exit_receiver_thread, true)
+          Log.expects(:warn)
+          runner.send(:receiver_thread)
+        end
+
+        it 'should log if a message was received by not directed at the server' do
+          runner.expects(:receive).raises(NotTargettedAtUs)
+          runner.instance_variable_set(:@exit_receiver_thread, true)
+          Log.expects(:debug).with("Message does not pass filters, ignoring")
+          runner.send(:receiver_thread)
+        end
+
+        it 'should back off on MessageNotReceived and UnexpectedMessageType' do
+          runner.expects(:receive).raises(MessageNotReceived.new(1))
+          runner.instance_variable_set(:@exit_receiver_thread, true)
+          Log.expects(:warn)
+          Log.expects(:info).with("sleeping for suggested 1 seconds")
+          runner.expects(:sleep).with(1)
+          runner.send(:receiver_thread)
+        end
+      end
+    end
+  end
+end

data/spec/unit/unix_daemon_spec.rb

@@ -18,7 +18,7 @@ module MCollective
         File.expects(:open).with("/nonexisting", "w").yields(f)
 
         r = mock
-        r.expects(:run)
+        r.expects(:main_loop)
 
         Runner.expects(:new).returns(r)
         UnixDaemon.expects(:daemonize).yields
@@ -28,7 +28,7 @@ module MCollective
 
       it "should not write a pid file unless requested", :unless => MCollective::Util.windows? do
         r = mock
-        r.expects(:run)
+        r.expects(:main_loop)
 
         UnixDaemon.expects(:daemonize).yields
         Runner.expects(:new).returns(r)

data/spec/unit/windows_daemon_spec.rb

@@ -29,9 +29,7 @@ module MCollective
           runner = mock
           Runner.stubs(:new).returns(runner)
           d = WindowsDaemon.new
-          d.stubs(:running?).returns(true,false)
-          d.stubs(:state).returns(WindowsDaemon::RUNNING)
-          runner.expects(:run)
+          runner.expects(:main_loop)
           d.service_main
         end
 
@@ -49,12 +47,8 @@ module MCollective
       describe "#service_stop" do
         it "should log, disconnect, stop the runner and exit" do
           runner = mock
-          connector = mock
-          connector.expects(:disconnect)
           Log.expects(:info)
-          PluginManager.stubs(:[]).with("connector_plugin").returns(connector)
           d = WindowsDaemon.new
-          d.instance_variable_set(:@runner, runner)
           runner.expects(:stop)
           d.service_stop
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.4.1
-  prerelease: 
+  version: 2.5.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Client libraries for the Mcollective Application Server
 email: info@puppetlabs.com
 executables:
@@ -102,6 +86,7 @@ files:
 - lib/mcollective/rpc/progress.rb
 - lib/mcollective/rpc/agent.rb
 - lib/mcollective/rpc/actionrunner.rb
+- lib/mcollective/exceptions.rb
 - lib/mcollective/log.rb
 - lib/mcollective/data.rb
 - lib/mcollective/logger.rb
@@ -180,6 +165,7 @@ files:
 - spec/unit/shell_spec.rb
 - spec/unit/matcher_spec.rb
 - spec/unit/windows_daemon_spec.rb
+- spec/unit/runner_spec.rb
 - spec/unit/ssl_spec.rb
 - spec/unit/registration/base_spec.rb
 - spec/unit/client_spec.rb
@@ -250,7 +236,6 @@ files:
 - spec/unit/pluginpackager_spec.rb
 - spec/unit/util_spec.rb
 - spec/unit/message_spec.rb
-- spec/unit/security/runner_spec.rb
 - spec/unit/security/base_spec.rb
 - spec/unit/symbol_spec.rb
 - spec/unit/logger/syslog_logger_spec.rb
@@ -294,9 +279,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -324,6 +309,7 @@ test_files:
 - spec/unit/shell_spec.rb
 - spec/unit/matcher_spec.rb
 - spec/unit/windows_daemon_spec.rb
+- spec/unit/runner_spec.rb
 - spec/unit/ssl_spec.rb
 - spec/unit/registration/base_spec.rb
 - spec/unit/client_spec.rb
@@ -394,7 +380,6 @@ test_files:
 - spec/unit/pluginpackager_spec.rb
 - spec/unit/util_spec.rb
 - spec/unit/message_spec.rb
-- spec/unit/security/runner_spec.rb
 - spec/unit/security/base_spec.rb
 - spec/unit/symbol_spec.rb
 - spec/unit/logger/syslog_logger_spec.rb

data/spec/unit/security/runner_spec.rb

@@ -1,67 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-module MCollective
-  describe Runner do
-    let(:config) do
-      c = mock
-      c.stubs(:loadconfig)
-      c.stubs(:configured).returns(true)
-      c.stubs(:mode=)
-      c
-    end
-
-    let(:stats) { mock }
-
-    let(:security) do
-      s = mock
-      s.stubs(:initiated_by=)
-      s
-    end
-
-    let(:connector) do
-      c = mock
-      c.stubs(:connect)
-      c
-    end
-
-    let(:agents) { mock }
-
-    before :each do
-      Config.stubs(:instance).returns(config)
-      PluginManager.stubs(:[]).with('global_stats').returns(stats)
-      PluginManager.stubs(:[]).with('security_plugin').returns(security)
-      PluginManager.stubs(:[]).with('connector_plugin').returns(connector)
-      Agents.stubs(:new).returns(agents)
-    end
-
-    describe 'initialize' do
-      it 'should set up the signal handlers when not on windows' do
-        Util.stubs(:windows).returns(false)
-        Signal.expects(:trap).with('USR1').yields
-        Signal.expects(:trap).with('USR2').yields
-        agents.expects(:loadagents)
-        Log.expects(:info).twice
-        Log.expects(:cycle_level)
-        Runner.new(nil)
-      end
-
-      it 'should not set up the signal handlers when on windows' do
-        Util.stubs(:windows?).returns(true)
-        Signal.expects(:trap).with('USR1').never
-        Signal.expects(:trap).with('USR2').never
-        Util.expects(:setup_windows_sleeper)
-        Runner.new(nil)
-      end
-
-      it 'should log a message when it cannot initialize the runner' do
-        Config.stubs(:instance).raises('failure')
-        Log.expects(:error).times(3)
-        expect {
-          Runner.new(nil)
-        }.to raise_error 'failure'
-      end
-    end
-  end
-end