dtk-node-agent 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 66132611a40d998867d1dd8ec4cd86a47d8cda1b
-  data.tar.gz: 9ed30e7ef2172f4590367ca5c6dc21dc0ada2ad3
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZThkYzFjNTQ4ZDY3MTFiNTc1NjdlNzEyMGRiYzk3MzBkN2Y1ZmU0Yg==
+  data.tar.gz: !binary |-
+    Zjk3MTc1NTAxZDAxMThmYzYzNjAwMzczYmI0ZWIwOWIxYjFmY2ZjYg==
 SHA512:
-  metadata.gz: b9fdae9f7469c55b728d01e974985b45d332b4264f50561f67acc76bb2130adb85e96f83c9451192909ca5838cffaed8f1c122ee63343de89eeab017d0d6e83f
-  data.tar.gz: 2100a2a17c316444105d1722c0a3a3f41179f3ac13583282e773f3805ce6644828af911cc8bb8207b442ad64035aacac5cb66be15e85d7876780e3266619c980
+  metadata.gz: !binary |-
+    YzU5NzAyNjc1ZDFkNmIzZWM4OTUxYWZkMjNjNDA0OGFjYzZhNDM5MzViODAz
+    YWI0OGU3NDA2NTUxM2U0MmNmNTk4NGQ1ZDYyYjU5MWFhNDJkMDA0OTVmNGY5
+    Mzk2YTIzYmVmOWYwMDgwZGM0ZDc2NWNmODY2MjU2NTE2NGEzM2M=
+  data.tar.gz: !binary |-
+    YzJhYTZiNjlmY2E5ODMwMjczNDU2NTM1N2MyYzRmYzAxM2I0MjRhYmU1Zjcw
+    OGVhMWQyMmM5YmZjNTkyNTZiZTZkNmQwOTA4OWEyYWIwYjRhM2MwZTJmOTgw
+    MGY3OTZmYjc2NGY1NDAxODg2MmM5NjY4ZDRlNjYxMGMyNDAxNGI=

data/lib/dtk-node-agent/version.rb

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.5.15"
+  VERSION="0.5.16"
 end

data/mcollective_additions/plugins/v2.2/agent/execute_tests_v2.rb

@@ -20,8 +20,12 @@ module MCollective
         json_formatter = RSpec::Core::Formatters::JsonFormatter.new(config.output)
         reporter =  RSpec::Core::Reporter.new(json_formatter)
         config.instance_variable_set(:@reporter, reporter)
-        ::RSpec::Core::Runner.run([spec_path,'--format','j'])
-        json_formatter.output_hash
+        begin
+          ::RSpec::Core::Runner.run([spec_path,'--format','j'])
+          json_formatter.output_hash
+        rescue Exception => e
+          return e.message
+        end
       end
     end
 
@@ -65,29 +69,31 @@ module MCollective
 
       action "execute_tests_v2" do
         spec_helper = ServerSpecHelper.new
-        all_tests = Dir["#{ModulePath}/*/#{ServerspecPath}/*.rb"]
         all_spec_results = []
 
         #Pull latest changes for modules if any
         git_server = Facts["git-server"]
 
-        begin
-          request[:components].each do |component|
-            #Filter version context for modules that exist on node
-            filtered_version_context = request[:version_context].select { |x| x[:implementation] == component[:module_name] }.first
-            pull_modules(filtered_version_context,git_server)
+        request[:components].each do |component|
+          #Filter version context for modules that exist on node
+          filtered_version_context = request[:version_context].select { |x| x[:implementation] == component[:module_name] }.first
+          pull_modules(filtered_version_context,git_server)
 
-            test = all_tests.select { |test| (test.include? component[:test_name]) && (test.include? component[:module_name]) }
-            @log.info("Executing serverspec test: #{test.first}")
+          component_name = ""
+          if component[:component].include? "/"
+            component_name = component[:component].split("/").last
+          else
+            component_name = component[:component]
+          end
 
-            spec_results = spec_helper.execute(test.first, component[:params])
-            component_name = ""
-            if component[:component].include? "/"
-	            component_name = component[:component].split("/").last
-	          else
-	            component_name = component[:component]
-            end
+          #all_tests needs to be calculated after the pull module done
+          all_tests = Dir["#{ModulePath}/*/#{ServerspecPath}/*.rb"]
+          test = all_tests.select { |test| (test.include? component[:test_name]) && (test.include? component[:module_name]) }
+          @log.info("Executing serverspec test: #{test.first}")
+          spec_results = spec_helper.execute(test.first, component[:params])
+          @log.info("Serverspec results: #{spec_results}")
 
+          if spec_results.is_a?(Hash)
             spec_results[:examples].each do |spec|
               spec_result = {}
               spec_result.store(:module_name, component[:module_name])
@@ -96,20 +102,30 @@ module MCollective
               spec_result.store(:test_name, component[:test_name])
               spec_result.store(:test_result, spec[:full_description])
               spec_result.store(:status, spec[:status])
+
+              if spec[:status].include? "failed"
+                backtrace = spec[:exception][:backtrace].find { |x| x.include? component[:module_name] }
+                error = backtrace + " " + spec[:exception][:class] + ": " + spec[:exception][:message]
+                spec_result.store(:test_error, error)
+              end
               all_spec_results << spec_result
             end
+          else
+            spec_result = {}
+            spec_result.store(:module_name, component[:module_name])
+            spec_result.store(:component_name, component_name)
+            spec_result.store(:test_component_name, component[:test_component])
+            spec_result.store(:test_name, component[:test_name])
+            spec_result.store(:test_result, "N/A")
+            spec_result.store(:status, "failed")
+            spec_result.store(:test_error, spec_results)
+            all_spec_results << spec_result
           end
-          reply[:data] = all_spec_results
-          reply[:pbuilderid] = Facts["pbuilderid"]
-          reply[:status] = :ok
-        rescue Exception => e
-          @log.info("Error while executing serverspec test")
-          @log.info(e.message)
-          reply[:data] = { :test_error => "#{e.message.lines.first}" }
-          reply[:pbuilderid] = Facts["pbuilderid"]
-          reply[:status] = :notok
         end
+        reply[:data] = all_spec_results
+        reply[:pbuilderid] = Facts["pbuilderid"]
+        reply[:status] = :ok
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -193,12 +193,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []