litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the LoadTesting framework.

Browse source 
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-22 15:43:05 -04:00
parent d1c889b5d0
commit 54e3fd4c16
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utilities/LoadTesting/scripts/_mergeTestResults
View file

@ -17,7 +17,7 @@ properties = {}
source_dir = "#{@home}/testinfo/results/#{@site_name}" source_dir = "#{@home}/testinfo/results/#{@site_name}"
properties["source_directory"] = source_dir properties["source_directory"] = source_dir
properties["target_directory"] = "/var/www/html/loadTesting/" properties["target_directory"] = "#{@home}/webpages/"
properties["site_name"] = "#{@site_name}" properties["site_name"] = "#{@site_name}"
suggestions = [] suggestions = []

4
utilities/LoadTesting/scripts/_runTest
View file

@ -41,7 +41,7 @@ def locate_files()
@author_uris_file = "#{data_dir}/authorUris.csv" @author_uris_file = "#{data_dir}/authorUris.csv"
raise "Author URIs file doesn't exist: '#{@author_uris_file}'" unless File.file?(@author_uris_file) raise "Author URIs file doesn't exist: '#{@author_uris_file}'" unless File.file?(@author_uris_file)
@xsl_stylesheet_file = "/home/jeb228/LoadTesting/jmeter/jakarta-jmeter-2.4/extras/jmeter-results-report_21.xsl" @xsl_stylesheet_file = "#{@home}/jmeter/jakarta-jmeter-2.4/extras/jmeter-results-report_21.xsl"
end end
def prepare_jmeter_properties() def prepare_jmeter_properties()
@ -87,7 +87,7 @@ locate_files()
prepare_jmeter_properties() prepare_jmeter_properties()
test_the_webapp() test_the_webapp()
Dir.chdir("/home/jeb228/LoadTesting/jmeter/jakarta-jmeter-2.4/bin") do |path| Dir.chdir("#{@home}/jmeter/jakarta-jmeter-2.4/bin") do |path|
puts "RUNNING TESTS" puts "RUNNING TESTS"
system "./jmeter -n -t #{@test_jmx_file} -l #{@test_jtl_file} -j #{@test_log_file} #{@jmeter_properties}" system "./jmeter -n -t #{@test_jmx_file} -l #{@test_jtl_file} -j #{@test_log_file} #{@jmeter_properties}"
puts "CONVERTING TO HTML" puts "CONVERTING TO HTML"