[astute] Fix unittests after change in ProxyReporter.

lib/astute/reporter.rb

@@ -55,14 +55,16 @@ module Astute
 
       def get_overall_status(data)
         status = data['status']
-        error_nodes = @nodes.select {|n| n['status'] == 'error'}
-        status = 'error' if error_nodes.any?
         msg = case status
-              when 'error'
-                error_uids = error_nodes.map{|n| n['uid']}
-                data['error'] || "Error occured on nodes #{error_uids.inspect}"
               when 'ready'
-                data['error'] || "Deployment finished successfully"
+                error_nodes = @nodes.select {|n| n['status'] == 'error'}
+                if error_nodes.any?
+                  status = 'error'
+                  error_uids = error_nodes.map{|n| n['uid']}
+                  "Some error occured on nodes #{error_uids.inspect}"
+                else
+                  data['error']
+                end
               else
                 data['error']
               end
@@ -178,16 +180,20 @@ module Astute
       def get_overall_status(data)
         status = data['status']
         error_nodes = @nodes.select {|n| n['status'] == 'error'}
-        status = 'error' if error_nodes.any?
-        msg = case status
-              when 'error'
-                error_uids = error_nodes.map{|n| n['uid']}
+        if error_nodes.any?
+          error_uids = error_nodes.map{|n| n['uid']}
+          msg = case status
+                when 'error'
+                data['error'] || "Cannot download release on nodes #{error_uids.inspect}"
+                when 'ready'
+                status = 'error'
                 "Cannot download release on nodes #{error_uids.inspect}"
-              when 'ready'
-                "Release downloaded successfully"
-              else
-                data['error']
-              end
+                else
+                  data['error']
+                end
+        else
+          msg = data['error']
+        end
         progress = data['progress'] || calculate_overall_progress
 
         {'status' => status, 'error' => msg, 'progress' => progress}.reject{|k,v| v.nil?}

spec/unit/nailyfact_deploy_spec.rb

@@ -278,8 +278,7 @@ describe "NailyFact DeploymentEngine" do
           'management_address' => '192.168.0.2'
         }
 
-        Astute::Metadata.expects(:publish_facts).with(@ctx, node['uid'], expect)
-        @deploy_engine.create_facts(node, attrs)
+        @deploy_engine.create_facts(node, attrs).should == expect
       end
     end
   end

spec/unit/puppetd_spec.rb

@@ -25,7 +25,7 @@ describe "Puppetd" do
       @ctx = mock
       @ctx.stubs(:task_id)
       @reporter = mock('reporter')
-      @ctx.stubs(:reporter).returns(ProxyReporter.new(@reporter))
+      @ctx.stubs(:reporter).returns(ProxyReporter::DeploymentProxyReporter.new(@reporter))
       @ctx.stubs(:deploy_log_parser).returns(Astute::LogParser::NoParsing.new)
     end
 

spec/unit/reporter_spec.rb

@@ -25,7 +25,7 @@ describe "ProxyReporter" do
                              {'status' => 'deploying', 'uid' => '2',
                               'progress' => 54}]}
       @up_reporter = mock('up_reporter')
-      @reporter = ProxyReporter.new(@up_reporter)
+      @reporter = ProxyReporter::DeploymentProxyReporter.new(@up_reporter)
     end
 
     it "reports first-come data" do

spec/unit/simplepuppet_deploy_spec.rb

@@ -23,7 +23,7 @@ describe "SimplePuppet DeploymentEngine" do
       @ctx.stubs(:deploy_log_parser).returns(Astute::LogParser::NoParsing.new)
       @reporter = mock('reporter')
       @reporter.stub_everything
-      @ctx.stubs(:reporter).returns(Astute::ProxyReporter.new(@reporter))
+      @ctx.stubs(:reporter).returns(Astute::ProxyReporter::DeploymentProxyReporter.new(@reporter))
       @deploy_engine = Astute::DeploymentEngine::SimplePuppet.new(@ctx)
       @env = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "examples", "no_attrs.yaml"))
     end