rhc 0.95.13 → 0.95.14

data/bin/rhc-chk

@@ -170,13 +170,15 @@ module TestBase
     response = http.start {|http| http.request(req)}
     return response
   ensure
-    $debuginfo['fetches'] ||= []
-    body = RHC::json_decode(response.body)
-    body['data'] = body['data'] && body['data'] != '' ? RHC::json_decode(body['data']) : ''
-    $debuginfo['fetches'] << {url.to_s => {
-      'body' => body,
-      'header' => response.instance_variable_get(:@header)
-    }}
+    unless response.nil?
+      $debuginfo['fetches'] ||= []
+      body = RHC::json_decode(response.body)
+      body['data'] = body['data'] && body['data'] != '' ? RHC::json_decode(body['data']) : ''
+      $debuginfo['fetches'] << {url.to_s => {
+        'body' => body,
+        'header' => response.instance_variable_get(:@header)
+      }}
+    end
   end
 
   def continue_test
@@ -197,16 +199,25 @@ end
 #####################################################
 
 def error_for(name,*args)
-  if name.kind_of? String
-    name = name.downcase.to_sym
-  end
+  # Make sure the name is a downcased symbol
+  name = name.to_s.downcase.to_sym
+
+  # Create message template
+  message = [:errors,:solutions].map{|x| get_message(x,name) }.compact.join("\n")
 
-  message = sprintf(get_message(:errors,name),*(args.shift || ''))
-  solution = get_message(:solutions,name)
-  if solution
-    message << "\n" << sprintf(solution,*(args.shift || ''))
+  # Params for message template
+  params = args.flatten
+
+  # Ensure we have the right number of placeholders
+  num_placeholders = message.scan("%s").length
+  unless num_placeholders == params.length
+    warn("\nWARNING: error_for called with wrong number of args from: \n\t%s\n" % caller[0]) if $debug
+    # This will ensure we have the right number of arguments, but should not get here
+    params << Array.new(num_placeholders,"???")
   end
-  message
+
+  # Return the message
+  message % params.flatten
 end
 
 def get_message(type,name)
@@ -320,16 +331,23 @@ class Test3_SSH < Test::Unit::TestCase
     flunk(error_for(:no_account,test)) if $user_info.nil?
   end
 
+  def require_domain(test)
+    flunk(error_for(:no_domain,test)) if $user_info['user_info']['domains'].empty?
+  end
+
   def require_remote_keys(test)
     require_login(test)
+    require_domain(test)
     @@remote_pub_keys ||= (
-
-    ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
-    my_keys = [ssh_keys['ssh_key'], ssh_keys['keys'].values.map{|k| k['key']}].flatten
-    my_keys.delete_if{|x| x.length == 0 }
+      ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
+      my_keys = [ssh_keys['ssh_key'], ssh_keys['keys'].values.map{|k| k['key']}].flatten
+      my_keys.delete_if{|x| x.length == 0 }
       my_keys
     )
-    flunk(error_for(:no_remote_pub_keys,test)) if @@remote_pub_keys.nil?
+
+    missing_keys = [:nil?,:empty?].map{|f| @@remote_pub_keys.send(f) rescue false }.inject(:|)
+
+    flunk(error_for(:no_remote_pub_keys,test)) if missing_keys
   end
 
   def require_agent_keys(fatal = true)
@@ -376,7 +394,7 @@ class Test3_SSH < Test::Unit::TestCase
   end
 
   def test_03_remote_ssh_keys
-    require_remote_keys("whether you have a valid key loaded in your agent")
+    require_remote_keys("whether your local SSH keys match the ones in your account")
     require_agent_keys(false)
 
     assert !(@@remote_pub_keys & [agent_key_fingerprints,libra_public_key].flatten).empty? ,error_for(:pubkey_not_loaded," ")
@@ -384,6 +402,7 @@ class Test3_SSH < Test::Unit::TestCase
 
   def test_04_ssh_connect
     require_login("connecting to your applications")
+    require_domain("connecting to your applications")
 
     host_template = "%%s-%s.%s" % [
       $user_info['user_info']['domains'][0]['namespace'],
@@ -530,6 +549,7 @@ $messages = YAML.load <<-EOF
   :no_derive: "We were unable to derive your public SSH key and compare it to the remote"
   :no_connectivity: "Cannot connect to server, therefore most tests will not work"
   :no_account: "You must have an account on the server in order to test: %s"
+  :no_domain: "You must have a domain associated with this account in order to test: %s"
   :cant_connect: You need to be able to connect to the server in order to test authentication
   :no_match_pub: "Local %s does not match remote pub key, SSH auth will not work"
   :_404: "The user %s does not have an account on this server"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 377
+  hash: 383
   prerelease: false
   segments: 
   - 0
   - 95
-  - 13
-  version: 0.95.13
+  - 14
+  version: 0.95.14
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 -05:00
+date: 2012-07-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency