oats 0.0.7 → 0.0.8

data/bin/agent

@@ -23,7 +23,6 @@ Parameters: (also can be passed in via environment variables
  -u OATS_USER who started the agent. Used for logging purposes only.
  -r OATS_TESTS_REPOSITORY_VERSION Required to update the agent.
  -k kill the agent, or set OATS_KILL_AGENT
- -d DISPLAY_NUM Number of the VNC Display, for Linux only
 
 Example:
 /home/occadmin/oats/bin/agent -p 3011 -n occ_1 -r 403cc620c265db84dbd3fb7d7cce4d57416bff09
@@ -164,16 +163,6 @@ function fkill {
 	[ "$OATS_TESTS_CODE_VERSION" ] && agent_echo "Setting OATS code version to the requested version: $OATS_TESTS_CODE_VERSION]" # This is not set for development/debug
     fi
     export OATS_TESTS_CODE_VERSION
-#    echo "$OATS_AGENT_NICKNAME $OATS_AGENT_PORT" >| $config_agent_file
-    if [ "$OS" == "Linux" ]; then # Do this with VNC displays
-	# Allocate 2x as display. VNC takes 592x, vino takes next available from 59++
-#	vnc_num="2$(echo $OATS_AGENT_PORT | cut -c 4)"
-	vnc_num="$DISPLAY_NUM"
-	[ "$vnc_num" ] || vnc_num="1"
-	pgrep -fl "Xvnc4 :$vnc_num" >/dev/null || vncserver :$vnc_num -SecurityTypes=None -geometry 1900x1060
-	export DISPLAY=":$vnc_num.0"
-	agent_echo "Setting DISPLAY to $DISPLAY"
-    fi
     cd $OATS_HOME  # Needed for bundler
     agent_echo "Starting agent $OATS_AGENT_NICKNAME on port $OATS_AGENT_PORT"
     $ruby_com

data/doc/oats_httpd.conf

@@ -1,7 +1,11 @@
 # Drop in this HTTP CONF in the proper folder to be included in each Agent's
 # Apache configuration.
-#   - MacOS location: /etc/apache2/other, restart: sudo /usr/sbin/apachectl restart
-
+#   - MacOS 
+#        location: /etc/apache2/other, 
+#        command:  sudo /usr/sbin/apachectl restart
+#   - Ubuntu
+#        location: /etc/apache2/conf.d 
+#        command:  sudo /etc/init.d/apache2 restart
 # The following assumes oats and occ are placed under /home/occadmin.  You may
 # need to adjust these folders (or create soft-links) if they are placed
 # elsewhere.

data/lib/oats/driver.rb

@@ -192,7 +192,7 @@ module Oats
         when /\.xls$/
           suite = id
           require 'spreadsheet' unless defined?(Spreadsheet)
-          book = Spreadsheet.open test_yaml
+          book = Spreadsheet.open test_yaml, 'rb'
           tests = $oats_global['xl']
           unless tests and tests[id]
             xl_id = File.dirname(id)
@@ -254,6 +254,7 @@ module Oats
       cur_list.variations.last.end_time = Time.now.to_i if cur_list and cur_list.variations.last.end_time.nil?
       new_list = TestList.new(id,test_yaml)
       if variations.nil? or variations.empty?
+
         Driver.process_oats_data(oats_data)
         new_list.variations.last.end_time = Time.now.to_i
       else
@@ -446,7 +447,7 @@ module Oats
     # their test arrays in $oats_global['xl']
     def Driver.parse_xl(path,id)
       require 'spreadsheet' unless defined?(Spreadsheet)
-      book = Spreadsheet.open path
+      book = Spreadsheet.open path, 'rb'
       sheet = book.worksheet 'Main'
       Oats.assert sheet, "Could not locate worksheet 'Main' in: " + path
       list = Driver.xl_sheet_tests(sheet, id, 'Main', 'Test_Scenarios')

data/lib/oats/oats_lock.rb

@@ -149,6 +149,7 @@ module Oats
         #        break
         #      end
         processes.each do |process|
+          #          puts [process.Commandline, process.ProcessId, process.name].inspect
           if process.Commandline =~ proc_names
             matched.push [process.ProcessId,process.Name,nil, process.CommandLine]
           end
@@ -179,7 +180,9 @@ module Oats
     end
 
     def OatsLock.kill_webdriver_browsers
-      match = "ruby.*oats/lib/oats_main.rb"
+
+      #      match = "ruby.*oats/lib/oats_main.rb"
+      match = 'ruby.*oats(\\\\|\/)bin(\\\\|\/)oats'
       # Not tested on agents on Windows_NT
       if $oats_execution['agent']
         nickname = $oats_execution['agent']['execution:occ:agent_nickname']
@@ -211,7 +214,11 @@ module Oats
       end
       # If parent ruby dies, ppid reverts to "1"
       (chromedriver_procs + webdriver_procs).each do |pid,proc_name,ppid|
-        OatsLock.kill_pid pid if ppid == "1" and proc_name !~ /defunct/
+        if RUBY_PLATFORM =~  /(mswin|mingw)/
+          OatsLock.kill_pid pid 
+        else
+          OatsLock.kill_pid pid if ppid == "1" and proc_name !~ /defunct/
+        end
       end
     end
 

data/lib/oats/version.rb

@@ -1,3 +1,3 @@
 module Oats
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/oats.gemspec

@@ -12,8 +12,10 @@ Gem::Specification.new do |s|
   s.description = %q{A flexible automated system integration regression test framework.}
 
   s.rubyforge_project = "oats"
-  s.files         = File.directory?('.git') ? `git ls-files`.split("\n") : []
-  s.test_files    = File.directory?('.git') ? `git ls-files -- {test,spec,features}/*`.split("\n") : []
+  if RUBY_PLATFORM !~  /(mswin|mingw)/ # Does not like git ls-files
+    s.files         = File.directory?('.git') ? `git ls-files`.split("\n") : []
+    s.test_files    = File.directory?('.git') ? `git ls-files -- {test,spec,features}/*`.split("\n") : []
+  end
   #  s.test_files = ["test/test_cgi_wrapper.rb" ]
   s.executables   = %w{oats occ}
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oats
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Levent Atasoy