rightscale_selfservice 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmMxMmMxYzA0NDNmNzk2NWVjODZmNjRkYjBlZTc4ODJmZDZmMmM3YQ==
+    MTU5NjZkNTljNzJjOGYxYzQwNTZmMmQ5MWE0MTVhZTJkYjYxMGVkNw==
   data.tar.gz: !binary |-
-    MGUyNmQ0ZGZiZTAzNjllZmNjM2NiMzBlNjU2ZGE1ZjJlMjViMGRjZQ==
+    NWIwYzlhZDE0NjhlNjBhMTQ0YmM1Y2E0NjE4YzhlMDYzNzIyNzA4Yw==
 SHA512:
   metadata.gz: !binary |-
-    ODg5NTRhOTE2MmNkYzMzZjExMWY0ZDg0YzZmYTg1ZTE4ODE5ZTVjYzQ3MDYx
-    YTc5OWJhNDljMDA5ZjYxN2EwMmMxNWY2ZjQyYmZhZTgyMThjZjA2ZGY2YTU3
-    M2M1ZjliODVjZDU3YTBkMjdlZTM5NTU1NmM5NzFlNGNmMTNlYzQ=
+    ZmJkNzEyMmVmNjcyNmNiMzU1ZDM4YzQ0YjU5Yzg2ZGE4YmNlOWZmN2E3MzRl
+    YzYwMmQ5OTA1NjljYWRhMWUzZWFiZWE0YTVkYjc2MmQ2Nzg1YzI4Yzg5MTVj
+    NWJjMGZmZWQ0MDQwYzJiYTAyMzJkZWZlZDFiMjg0N2ZhMTRmMDk=
   data.tar.gz: !binary |-
-    OTcxMjc0N2FlZDJjNzNiMWYyYzllYzliY2NlNmJkMGM4MGMyZDRkOWQyM2Vi
-    ODIzMGY0NWFlOTZhYjYzYzI3N2I0OWJkNzJjMzAzZWU3NmZmMjZjNTFmNTQ0
-    NzIwMjVjMGQyOWI4MjI3ZjMzZTY5ODM1NzQ3ZDQxMjZhNTM1ODM=
+    ZDIzYzY1ZjlkNTBiN2MwN2E2MTU4NmIxZjUxYjIyZDFjMDVhYjNjM2ZlMWFl
+    ZDExZGZkMDJjZTc4Y2Q3MTA3YWM2ZmVhYTNmZDhmMGViODA1NzA3NjNjNTg3
+    MjA0YjhmNjhkYTlhMzUyMDcyODM4MmM0MmE1OTI1ZGIwNTJlYzE=

data/lib/rightscale_selfservice/test/case.rb

@@ -106,19 +106,7 @@ module RightScaleSelfService
                 end
                 true
               when 'running'
-                begin
-                  operation_id = RightScaleSelfService::Api::Client.get_resource_id_from_href(self.api_responses[:operation_create].headers[:location])
-                  if operation_id
-                    self.api_responses[:operation_show] = suite.api_client.manager.operation.show(:id => operation_id)
-                    json_str = self.api_responses[:operation_show].body
-                    show = JSON.parse(json_str)
-                    self.state = show['status']['summary']
-                  end
-                rescue RestClient::ExceptionWithResponse => e
-                  # TODO: Do I want to catch errors here, or let it fall through and
-                  # let the next pump retry?
-                  self.errors << "Failed to check operation status\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
-                end
+                get_operation_summary_set_as_state(suite,template)
               when 'completed','failed'
                 if self.options[:state] == self.state
                   self.result = 'SUCCESS'
@@ -132,6 +120,8 @@ module RightScaleSelfService
                   end
                 end
                 false
+              when 'not_started'
+                get_operation_summary_set_as_state(suite,template)
               else
               end
             elsif template.state == 'failed'
@@ -150,6 +140,26 @@ module RightScaleSelfService
           end
         end
       end
+
+      private
+
+      def get_operation_summary_set_as_state(suite,template)
+        begin
+          operation_id = RightScaleSelfService::Api::Client.get_resource_id_from_href(self.api_responses[:operation_create].headers[:location])
+          if operation_id
+            self.api_responses[:operation_show] = suite.api_client.manager.operation.show(:id => operation_id)
+            json_str = self.api_responses[:operation_show].body
+            show = JSON.parse(json_str)
+            self.state = show['status']['summary']
+          end
+          true
+        rescue RestClient::ExceptionWithResponse => e
+          # TODO: Do I want to catch errors here, or let it fall through and
+          # let the next pump retry?
+          self.errors << "Failed to check operation status\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
+          false
+        end
+      end
     end
   end
 end

data/lib/rightscale_selfservice/test/shell_report.rb

@@ -41,7 +41,8 @@ module RightScaleSelfService
           if template.state == "finished" && !@reported_templates.include?(template)
             puts "#{template.name}: #{template.state}"
             template.cases.each do |testcase|
-              puts "  #{get_case_type_and_name(testcase)}: #{@keyword_substitutions[testcase.result]}"
+              result = @keyword_substitutions.has_key?(testcase.result) ? @keyword_substitutions[testcase.result] : testcase.result
+              puts "  #{get_case_type_and_name(testcase)}: #{result}"
             end
             @reported_templates << template
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rightscale_selfservice
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryan J. Geyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor