Update the LoadTesting framework.

Permit use of Git while still supporting Subversion. Improve the script structure and reduce dependence on hard-coded paths.
This commit is contained in:
j2blake 2013-10-21 15:21:54 -04:00
parent f382ec0468
commit 4f085bcdfe
20 changed files with 120 additions and 70 deletions

View file

@ -10,12 +10,12 @@ into an HTML file so we can easily compare them.
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require "#{File.dirname(__FILE__)}/subscripts/test_result_merger"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
require 'subscripts/test_result_merger'
properties = {}
source_dir = "/home/jeb228/LoadTesting/testinfo/results/#{@site_name}"
source_dir = "#{@home}/testinfo/results/#{@site_name}"
properties["source_directory"] = source_dir
properties["target_directory"] = "/var/www/html/loadTesting/"
properties["site_name"] = "#{@site_name}"
@ -38,5 +38,3 @@ trm = TestResultMerger.new(properties)
trm.merge
puts "TestResultMerger was successful."