stella 0.8.7.001 → 0.8.7.002

data/CHANGES.txt

@@ -10,6 +10,13 @@ STELLA, CHANGES
 * TODO: request block conditions. 
 * TODO: process templates for calls to set in get blocks
 
+#### 0.8.7.002 (2010-06-14) ###############################
+
+* FIXED: Specifying a host w/ a path and no testplan no longer doubles up the path
+* ADDED: Global HTTP client timeout ("stella -T 60")
+* CHANGE: Timeouts are reported as exceptions. 
+
+
 #### 0.8.7 (2010-05-21) ###############################
 
 * FIXED: sequential, rsequential, and random values were broken for Arrays

data/VERSION.yml

@@ -2,4 +2,4 @@
 :MAJOR: 0
 :MINOR: 8
 :PATCH: 7
-:BUILD: '001'
+:BUILD: '002'

data/bin/stella

@@ -45,6 +45,7 @@ class Stella::CLI::Definition
   global :W, :wait, Integer, "Seconds to wait before starting test"
   global :H, :withheader, "Include X-Stella-ID request header" 
   global :P, :withparam, "Include __stella query parameter header"
+  global :T, :timeout, Float, "HTTP request timeout (default: unlimited)"
   global :o, :output, String, "Write output to the given file" do |v|
     String.disable_color
     Stella.log.output = v

data/lib/stella.rb

@@ -17,7 +17,9 @@ require 'gibbler/aliases'  # important for run time digests and freezes
 require 'benelux'
 require 'proc_source'
 
-class OpenStruct;                include Gibbler::Object;    end
+class OpenStruct
+  include Gibbler::Object
+end
 
 module Stella
   module VERSION

data/lib/stella/cli.rb

@@ -25,7 +25,7 @@ class Stella::CLI < Drydock::Command
     [:nowait, :clients, :repetitions, :duration, :arrival, :granularity, :'wait'].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
-    [:'notemplates', :'nostats', :'noheader', :'noparam'].each do |opt|
+    [:'notemplates', :'nostats', :'noheader', :'noparam', :'timeout'].each do |opt|
       opts[opt] = @global.send(opt) unless @global.send(opt).nil?
     end
     testrun = Stella::Testrun.new @testplan, opts
@@ -89,7 +89,7 @@ class Stella::CLI < Drydock::Command
     end
     @hosts = @argv.collect { |uri|; 
       uri = 'http://' << uri unless uri.match /^https?:\/\//i
-      URI.parse uri; 
+      obj = URI.parse uri
     }
     if @option.testplan
       @testplan = Stella::Testplan.load_file @option.testplan

data/lib/stella/client.rb

@@ -28,7 +28,8 @@ module Stella
         :withparam => false,
         :withheader => false,
         :notemplates => false,
-        :wait => 0
+        :wait => 0, 
+        :timeout => nil
       }.merge! opts
       @opts = opts
       @base_uri, @index = base_uri, index
@@ -86,8 +87,8 @@ module Stella
             http_client.set_auth(domain, user, pass)
           end
           
-          if tout = req.timeout || usecase.timeout
-            http_client.receive_timeout = tout
+          if tout = req.timeout || usecase.timeout || @opts[:timeout]
+            http_client.receive_timeout = tout if tout > 0
           end
           Stella.ld "TIMEOUT " << http_client.receive_timeout.to_s
           
@@ -145,7 +146,7 @@ module Stella
           asset_duration = Time.now - asset_start
         rescue HTTPClient::ConnectTimeoutError, HTTPClient::SendTimeoutError,
                Errno::ECONNRESET, HTTPClient::ReceiveTimeoutError => ex
-          update(:request_timeout, usecase, uri, req, params, headers, counter, container)
+          update(:request_timeout, usecase, uri, req, params, headers, counter, container, http_client.receive_timeout)
           Benelux.remove_thread_tags :status, :retry, :request, :stella_id
           next
         rescue => ex
@@ -304,7 +305,7 @@ module Stella
       
       # Support for specifying default path prefix:
       # $ stella verify -p plan.rb http://localhost/basicauth
-      if URI::Generic === base_uri && base_uri.path
+      if URI::Generic === base_uri && base_uri.path && uri != base_uri
         if uri.path.nil? || uri.path.empty?
           begin
             uri.path = base_uri.path

data/lib/stella/engine.rb

@@ -95,6 +95,7 @@ class Stella::Testrun < Storable
   field :duration => Integer
   field :arrival => Float
   field :repetitions => Integer
+  field :timeout => Integer
   field :wait => Range
   field :nowait => TrueClass
   field :logsize => Integer
@@ -148,7 +149,8 @@ class Stella::Testrun < Storable
       :notemplates => self.notemplates || false,
       :withparam => self.withparam || false,
       :withheader => self.withheader || false,
-      :wait => self.wait || 0
+      :wait => self.wait || 0, 
+      :timeout => self.timeout
     }
   end
   
@@ -194,6 +196,7 @@ class Stella::Testrun < Storable
     # Support durations in the form "30m", "2h", etc...
     @duration = @duration.in_seconds if String === @duration
     
+    @timeout &&= @timeout.to_f
     @clients &&= @clients.to_i
     @duration &&= @duration.to_i
     @arrival &&= @arrival.to_f

data/lib/stella/engine/functional.rb

@@ -6,6 +6,8 @@ module Stella::Engine
       client = Stella::Client.new testrun.hosts.first, testrun.client_options
       client.add_observer(self)
       
+      p testrun.client_options
+      
       Stella.stdout.info2 $/, "Starting test...", $/
       testrun.start_time = Time.now.utc.to_i
       
@@ -145,9 +147,9 @@ module Stella::Engine
       Stella.stdout.info "  AUTH   #{domain} (#{user}/#{pass})"
     end
     
-    def update_request_timeout(client_id, usecase, uri, req, params, headers, counter, container)
+    def update_request_timeout(client_id, usecase, uri, req, params, headers, counter, container, timeout)
       Benelux.thread_timeline.add_count :failed, 1
-      Stella.stdout.info "  TIMEOUT   %-53s" % [uri]
+      Stella.stdout.info "  TIMEOUT(%f)   %-53s" % [uri, timeout]
     end
     
   end

data/lib/stella/engine/load.rb

@@ -441,7 +441,7 @@ module Stella::Engine
     
     def update_request_unhandled_exception(client_id, usecase, uri, req, params, ex)
       Benelux.thread_timeline.add_message ex.message, :kind => :exception
-      Benelux.thread_timeline.add_count :error, 1
+      Benelux.thread_timeline.add_count :exception, 1
       desc = "#{usecase.desc} > #{req.desc}"
       if Stella.stdout.lev == 2
         Stella.stdout.print 2, '.'.color(:red)
@@ -491,12 +491,13 @@ module Stella::Engine
       Benelux.thread_timeline.add_message args.join('; '), :kind => :authentication
     end
     
-    def update_request_timeout(client_id, usecase, uri, req, params, headers, counter, container)
-      Stella.stdout.info3 "  Client-%s     TIMEOUT   %-53s" % [client_id.shorter, uri]
-      Benelux.thread_timeline.add_count :failed, 1
+    def update_request_timeout(client_id, usecase, uri, req, params, headers, counter, container, timeout)
+      msg = "  Client-%s     TIMEOUT(%.1f)   %-53s" % [client_id.shorter, timeout, uri]
+      Stella.stdout.info3 msg
+      Benelux.thread_timeline.add_count :exception, 1
       args = [Time.now.to_f, Stella.sysinfo.hostname, client_id.short]
       args.push [uri, 'TOUT', container.unique_id[0,10]]
-      Benelux.thread_timeline.add_message args.join('; '), :kind => :timeout
+      Benelux.thread_timeline.add_message msg , :kind => :exception
     end
     
     def self.rescue(client_id, &blk)

data/lib/stella/testplan.rb

@@ -38,7 +38,6 @@ class Testplan < Storable
   field :description => String
   #field :resources
   
-  # TODO: Add Stellar::TOKEN to the calculation
   gibbler :usecases, :userid
   
   def initialize(*uris)

data/stella.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "0.8.7.001"
+  s.version = "0.8.7.002"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2010-05-21}
+  s.date = %q{2010-06-15}
   s.default_executable = %q{stella}
   s.description = %q{Blame Stella for breaking your web application!}
   s.email = %q{delano@solutious.com}

data/support/sample_webapp/app.rb

@@ -51,7 +51,6 @@ end
 
 get '/' do
   @title << " - Search"
-  #sleep 0.05
   erb :search_form
 end
 
@@ -132,6 +131,12 @@ get '/listings.yaml' do
   @listings.to_yaml
 end
 
+65.times do |time|
+  get "/timeout_#{time}" do
+    sleep time
+    'slept for %d' % time 
+  end
+end
 
 before do
   @cookie = request.cookies["bff-history"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.8.7.001
+  version: 0.8.7.002
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -04:00
+date: 2010-06-15 00:00:00 -04:00
 default_executable: stella
 dependencies: 
 - !ruby/object:Gem::Dependency