cafe-grader-web Commit - r315:faf1f66729ca

cafe-grader-web

parent | child

Description:

load test reads site_url from command line

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r315:faf1f66729ca - Sun, 20 Jun 2010 10:43:27 - 5 files changed: 28 inserted, 182 deleted

test/load/NOTES ¶ +1 -1

@@ -3,5 +3,5
3		3
4	Load test for front page:	4	Load test for front page:
5		5
6	- ruby runner.rb common_visitors.rb FirstPageViewer 10 -t 10	6	+ ruby runner.rb common_visitors.rb FirstPageViewer 20 -t 10 --site_url=http://localhost/cafe
7		7

test/load/common_visitors.rb ¶ +5 -4

@@ -1,7 +1,8
1	- visitor "FirstPageViewer" do	1	+ if !defined? VISITOR_OPTION_LIST
2	- stores_cookies	2	+ VISITOR_OPTION_LIST = {}
		3	+ end
3		4
4	- site_url "http://localhost:3000"	5	+ visitor "FirstPageViewer", VISITOR_OPTION_LIST do
5	-	6	+ stores_cookies
6	get "/"	7	get "/"
7	end	8	end

test/load/runner.rb ¶ +14 -4

               end
               visitor_file = ARGV.shift
-            - require visitor_file
               load_time = 60
               dry_run = false
-            - #build visitor list
+            + #build visitor/option list
               visitor_list = {}
+            + visitor_option_list = {}
               while ARGV.length>0
                 key = ARGV.shift
                   num = ARGV.shift.to_i
                   load_time = num
                 else
-            -     num = ARGV.shift.to_i
+            +     if key =~ /--(\w+)=(.*)/
-            -     visitor_list[key] = num
+            +       # options
+            +       lm = Regexp.last_match
+            +       visitor_option_list[lm[1]] = lm[2]
+            +     else
+            +       # new visitor
+            +       num = ARGV.shift.to_i
+            +       visitor_list[key] = num
+            +     end
                 end
               end
+            + VISITOR_OPTION_LIST = visitor_option_list
+            + require visitor_file
+            +
               initialize_temp_dir
               runner visitor_list, load_time, {:dry_run => dry_run}

test/load/visitor_curl_cli.rb ¶ +8 -1

                     :options => options }
                 end
+            +   def self.process_options(options)
+            +     if options.has_key? "site_url"
+            +       self.base_url = options["site_url"]
+            +     end
+            +   end
+            +
                 def substitute_id(st)
                   return st if !(st.is_a? String)
                   st.gsub(/(()|(\$))\$\{id\}/) do |s|
                 end
               end
-            - def visitor(cname,&blk)
+            + def visitor(cname,options={},&blk)
                 c = Class.new(Visitor)
                 begin
                   Object.const_set(cname,c)
               ERROR
                   exit(0)
                 end
+            +   c.process_options(options)
                 c.instance_eval(&blk)
               end

test/load/visitor.rb removed ¶ -172

deleted file

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings