rwebspec-mechanize 0.2.1 → 0.4

data/CHANGELOG

@@ -1,3 +1,12 @@
+0.3
+ - Support RSpec 2.13
+
+0.2.3
+ - :virtual_user_count_per_rampup options
+
+0.2.2
+ - loadwise later threads will timeout in shorter time
+
 0.2
   - upgrade rwebspec 4
 

data/Rakefile

@@ -1,7 +1,8 @@
 require 'rubygems'
+gem 'rspec'
 require 'rspec/core/rake_task'
 # require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 # require 'rdoc' # require rdoc 2
 # gem 'darkfish-rdoc'
 # require 'darkfish-rdoc'
@@ -23,7 +24,7 @@ task :clean do
 end
 
 desc 'Run all specs'
-Spec::Rake::SpecTask.new('spec') do |t|
+RSpec::Core::RakeTask.new('spec') do |t|
   t.spec_opts = ['--format', 'specdoc', '--colour']
   # t.libs = ["lib", "server/lib" ]
   t.pattern = Dir['spec/**/*_spec.rb'].sort
@@ -73,7 +74,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec-mechanize"
-  s.version = "0.2.1"
+  s.version = "0.4"
   s.summary = "Web application load testing specification in Ruby"
   s.description = "Load test specification for web applications in RSpec syntax and Watir"
 
@@ -92,11 +93,11 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "test/**/*" )
   s.files = s.files + Dir.glob( "sample/**/*")
   s.files = s.files + Dir.glob( "docs/**/*" )
-  s.add_dependency(%q<rspec>, ["2.10.0"])
-  s.add_dependency("mechanize", ">= 2.5")
+  s.add_dependency(%q<rspec>, [">=2.14.0"])
+  s.add_dependency("mechanize", ">= 2.7")
   s.add_dependency("nokogiri")
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
 end

data/lib/rwebspec-mechanize/load_test_helper.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), "plugins", "loadwise_plugin.rb")
+require File.join(File.dirname(__FILE__), "plugins", "loadwise_plugin.rb")
 require "timeout"
 
 module RWebSpec
@@ -10,11 +11,10 @@ module RWebSpec
       include RWebSpec::Mechanize::Assert
       include RWebSpec::Mechanize::LoadWisePlugin
 
-      MAX_VU = 1000
+      MAX_VU = 10001
     
-      # only support firefox or Celerity
       def open_browser(base_url = nil, options = {})
-        default_options = {:resynchronize => false, :firefox => false, :go => false }      
+        default_options = {:resynchronize => false, :go => false }      
         options = default_options.merge(options)
       
         base_url ||= $LOADWISE_PROJECT_BASE_URL        
@@ -22,7 +22,7 @@ module RWebSpec
         	base_url ||= ENV["LOADWISE_PROJECT_BASE_URL"] # pass to java
 				end
         base_url ||= $BASE_URL
-        puts "[DEBUG] open |#{base_url}|#{$BASE_URL}| in browser"
+        # puts "[DEBUG] open |#{base_url}|#{$BASE_URL}| in browser"
 
         mode_preview = ($LOADWISE_PREVIEW || ENV['LOADWISE_PREVIEW'])
         
@@ -219,11 +219,13 @@ module RWebSpec
 	          default_opts[:peak_virtual_user_count] = ENV["LOADWISE_PEAK_VIRTUAL_USER_COUNT"].to_i if  ENV["LOADWISE_PEAK_VIRTUAL_USER_COUNT"]
 	          default_opts[:delay_between_thread_start] = ENV["LOADWISE_DELAY_BETWEEN_THREAD_START"].to_i if  ENV["LOADWISE_DELAY_BETWEEN_THREAD_START"]     
 	          default_opts[:for_how_long] = ENV["LOADWISE_FOR_HOW_LONG"].to_i if  ENV["LOADWISE_FOR_HOW_LONG"]
+	          default_opts[:virtual_user_count_per_rampup] = ENV["LOADWISE_VIRTUAL_USER_COUNT_PER_RAMPUP"].to_i if  ENV["LOADWISE_VIRTUAL_USER_COUNT_PER_RAMPUP"]
         	else
 						# default to performance testing
             default_opts = {:start_virtual_user_count => 1, 
                           :peak_virtual_user_count => 1, 
-                          :delay_between_thread_start => 0 }
+                          :delay_between_thread_start => 0,
+                          :virtual_user_count_per_rampup => 1 }
           end
         end
 
@@ -232,6 +234,8 @@ module RWebSpec
         start_virtual_user_count = opts[:start_virtual_user_count] || 2
         peak_virtual_user_count  = opts[:peak_virtual_user_count]  || 2
         delay_between_thread_start  =  opts[:delay_between_thread_start] || 0
+        virtual_user_count_per_rampup = opts[:virtual_user_count_per_rampup] || 1
+        
         for_how_long = opts[:for_how_long]
         
         # puts "DEBUG for_how_long => #{for_how_long}"
@@ -247,6 +251,7 @@ module RWebSpec
         end
       
         connect_to_loadwise("VU_START", "")
+        all_start_time = Time.now
 
         if (peak_virtual_user_count <= 1)
           yield
@@ -256,7 +261,7 @@ module RWebSpec
                 
           start_virtual_user_count.times do |idx|          
             threads[idx] = Thread.new do
-							Thread.current[:id] = idx
+							Thread.current[:id] = idx + 1
               start_time = Time.now
               vu_reports[idx] ||= []
               begin
@@ -264,6 +269,7 @@ module RWebSpec
                   Timeout::timeout(for_how_long) do 
                     while(true)
                       yield
+                      Thread.pass
                     end    
                   end            
                 else
@@ -271,11 +277,11 @@ module RWebSpec
                 end
                 
                 vu_reports[idx] =  Thread.current[:log]
-              rescue Timeout::Error
-                vu_reports[idx] =  Thread.current[:log]
-                puts "Too Slow 2"                   
+              rescue Timeout::Error                
+                # Looping finished
+                vu_reports[idx] = Thread.current[:log]                
               rescue => e
-                vu_reports[idx] =  Thread.current[:log]
+                vu_reports[idx] = Thread.current[:log] || []
                 vu_reports[idx] ||= []
                 vu_reports[idx] << { :error => e }
 								# TODO
@@ -289,49 +295,65 @@ module RWebSpec
               vu_reports[idx] ||= []
               vu_reports[idx] << { :message => "Total Duration (Initial)", :start_time => start_time, :duration => Time.now - start_time }     
               connect_to_loadwise("VU_END", Thread.current[:id].to_s)
-              puts "VU[#{idx+1}] #{Time.now - start_time}s"
+              # puts "VU[#{idx+1}] #{Time.now - start_time}s"
             end
           end
 
-          (peak_virtual_user_count - start_virtual_user_count).times do |nidx|
+          (start_virtual_user_count..peak_virtual_user_count).step(virtual_user_count_per_rampup) do |nidx|
             sleep delay_between_thread_start
-            idx = nidx + start_virtual_user_count
-            threads[idx] = Thread.new do
-              start_time = Time.now
-              vu_reports[idx] ||= []
-              begin
-                if for_how_long 
-                  Timeout::timeout(for_how_long) do 
-                    while(true)
-                      yield
-                    end    
-                  end            
-                else
-                  yield                  
+            virtual_user_count_per_rampup.times do |ridx|
+              idx = nidx + ridx
+              break if idx >= peak_virtual_user_count
+              if idx == (peak_virtual_user_count - 1)
+                connect_to_loadwise("VU_FULL", "#{Time.now}|#{Time.now - all_start_time}")      					
+              end
+							
+              threads[idx] = Thread.new do
+		  					Thread.current[:id] = idx + 1
+                start_time = Time.now
+                vu_reports[idx] ||= []
+                begin
+                  if for_how_long 
+                    remaining_time = for_how_long - (Time.now - all_start_time)
+                    remaining_time = 1 if remaining_time < 0
+                    Timeout::timeout(remaining_time) do 
+                      while(true)
+                        yield
+                        Thread.pass                        
+                      end    
+                    end            
+                  else
+                    yield                  
+                  end
+                  vu_reports[idx] =  Thread.current[:log]
+                rescue Timeout::Error
+                  # Looping finished
+                  vu_reports[idx] =  Thread.current[:log]
+                  # It is not error!!!
+                  # connect_to_loadwise("VU_ERROR", Thread.current[:id].to_s + "|" + "Timed out at #{Time.now.strftime('%H:%M:%S')} after #{for_how_long} s")
+                rescue => e
+                  vu_reports[idx] =  Thread.current[:log] || []                
+                  vu_reports[idx] << { :error => e }
+  								connect_to_loadwise("VU_ERROR", Thread.current[:id].to_s + "|" + e.to_s)	              								
+  								unless $vu_error_printed
+  									puts "VU[#{idx}] Failed: " +  e.backtrace.to_s
+  									$vu_error_printed = true
+  								end
                 end
-                vu_reports[idx] =  Thread.current[:log]
-              rescue Timeout::Error
-                vu_reports[idx] =  Thread.current[:log]
-                puts "!!!Too Slow 2"                                   
-              rescue => e
-                vu_reports[idx] =  Thread.current[:log]
                 vu_reports[idx] ||= []
-                vu_reports[idx] << { :error => e }
-								connect_to_loadwise("VU_ERROR", Thread.current[:id].to_s + "|" + e.to_s)	              								
-								unless $vu_error_printed
-									puts "VU[#{idx}] Failed: " +  e.backtrace.to_s
-									$vu_error_printed = true
-								end
-              end
-              vu_reports[idx] ||= []
-              vu_reports[idx] << { :message => "Total Duration (Peak)", :start_time => start_time,  :duration => Time.now - start_time }            
-              puts "VU[#{idx+1}] #{Time.now - start_time}s"
-            end          
+                vu_reports[idx] << { :message => "Total Duration (Peak)", :start_time => start_time,  :duration => Time.now - start_time }            
+                puts "VU[#{idx+1}] #{Time.now - start_time}s"
+              end          
+            
+            end #end of virtual user rampup
           end
           
           threads.each {|t| t.join; }
         
 =begin
+#
+# No, LoadWise unable to see the database, also needs SQLite3 for Java
+# 
 # after test finishing, don't try to parse the data, LoadWise can see $memory database
 
           vu_reports.each do |key, value|

data/lib/rwebspec-mechanize/plugins/loadwise_plugin.rb

@@ -11,11 +11,14 @@ module RWebSpec
     end
 
 		def connect_to_loadwise(message_type, body)
+		  if ENV['LOADWISE_TRACE_PORT']
+        $LOADWISE_TRACE_PORT ||= ENV['LOADWISE_TRACE_PORT'].to_i
+      end
 			return if RUBY_PLATFORM !~ /java/i && $LOADWISE_TRACE_PORT.nil?
 			# Thread.pass      
-			loadwise_port = ($LOADWISE_TRACE_PORT || 7125) + rand(5)
+			loadwise_port = ($LOADWISE_TRACE_PORT || 7125)
 	    the_message = message_type + "|" + body
-			
+			puts "[DEBUG] connect to LoadWise: #{loadwise_port}"
 		  begin
 		    # $log.info("[MESSAGE] " + the_message)
 		    loadwise_socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
@@ -25,7 +28,8 @@ module RWebSpec
 		    loadwise_socket.close
 		  rescue => e
 		    puts("Failed to contact LoadWise '#{message_type}|#{body}' at #{loadwise_port}: #{e}")
-				retry
+		    # Only from load testing, the message matters.
+				retry if RUBY_PLATFORM =~ /java/i
 		    # $log.warn("Failed to contact TestWise: #{e}")
 		  end
 		end

data/lib/rwebspec-mechanize/web_browser.rb

@@ -365,11 +365,9 @@ module RWebSpec
 			end
 			
       # raise "No button with id: #{id} found " unless the_button
-      if the_button.type == "submit"
-				puts "[DEBUG] submit the form" 
+      if the_button.type == "submit"				
         @browser.submit(the_form, the_button)
       else
-        puts "[DEBUG] Warning not submit button"
         @browser.submit(the_form, the_button)        
       end
 			

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec-mechanize
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: rwebspec-mechanize
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +71,6 @@ files:
 - MIT-LICENSE
 - lib/rwebspec-mechanize/assert.rb
 - lib/rwebspec-mechanize/context.rb
-- lib/rwebspec-mechanize/extensions/firewatir_extensions.rb
 - lib/rwebspec-mechanize/extensions/rspec_extensions.rb
 - lib/rwebspec-mechanize/extensions/watir_extensions.rb
 - lib/rwebspec-mechanize/extensions/window_script_extensions.rb
@@ -103,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: rwebspec-mechanize
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Web application load testing specification in Ruby

data/lib/rwebspec-mechanize/extensions/firewatir_extensions.rb

@@ -1,74 +0,0 @@
-module FireWatir
-  class Firefox
-
-    @@firefox_started = false
-
-    def initialize(options = {})
-      if(options.kind_of?(Integer))
-        options = {:waitTime => options}
-      end
-
-      if(options[:profile])
-        profile_opt = "-no-remote -P #{options[:profile]}"
-      else
-        profile_opt = ""
-      end
-
-      waitTime = options[:waitTime] || 2
-
-      os = RUBY_PLATFORM
-      if RUBY_PLATFORM =~ /java/ then
-        require 'rbconfig'
-        os = Config::CONFIG['host_os']
-      end
-
-      case os
-      when /mswin/ || /mingw/
-        begin
-          # Get the path to Firefox.exe using Registry.
-          require 'win32/registry.rb'
-          path_to_bin = ""
-          Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Mozilla\Mozilla Firefox') do |reg|
-            keys = reg.keys
-            reg1 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{keys[0]}\\Main")
-            reg1.each do |subkey, type, data|
-              if(subkey =~ /pathtoexe/i)
-                path_to_bin = data
-              end
-            end
-          end
-        rescue LoadError => e
-          path_to_bin = '"C:\Program Files\Mozilla Firefox\firefox.exe"'
-        end
-
-      when /linux/i
-        path_to_bin = `which firefox`.strip
-      when /darwin/i
-        path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
-      when /java/
-        raise "Error, should have set using rbconfig: #{os}"
-      end
-
-      @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
-
-      sleep waitTime
-      begin
-        set_defaults()
-      rescue Watir::Exception::UnableToStartJSShException
-        if !@t # no new thread starting browser, try again
-          puts "Firefox with JSSH not detected after you indicated @@firefox_started"
-          @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
-          sleep waitTime
-          set_defaults
-        end
-      end
-      get_window_number()
-      set_browser_document()
-    end
-
-    def self.firefox_started=(value)
-      @@firefox_started = value
-    end
-
-  end
-end