Commit Graph

203 Commits

Author SHA1 Message Date
luqiong 23709d0a94 remove all overrides
remove all overrides
2014-09-09 10:18:30 +08:00
coderfengyun 836a4102db add test for ratio take effect
add test for ratio take effect
2014-09-09 10:04:36 +08:00
hmm 270c4b8d14 add function recording many times in a port 2014-09-09 09:40:49 +08:00
hmm 37abca2229 response host ip to web when recording script
resolve stop recording button 
add highlight in new script and new testplan webpage
2014-09-04 17:43:29 +08:00
coderfengyun ff5dd49e0b remove all problem about ms to s
remove all problem about ms to s
2014-09-04 15:33:19 +08:00
coderfengyun 0f29deb274 remove a bug for ms to s
remove a bug for ms to s
:from milisecond to second
2014-09-04 15:02:53 +08:00
coderfengyun 5390aa5c05 ok, i can run it now
ok, i can run it now
2014-09-04 14:45:53 +08:00
hmm 5a0a1074c9 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 14:15:24 +08:00
hmm 9756ef1999 fix bug "scriptFilterOptionsModel may be null" 2014-09-04 14:15:06 +08:00
coderfengyun 55a78b46fe Merge remote-tracking branch 'origin/master'
Conflicts:

	Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java

	Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
2014-09-04 14:09:13 +08:00
coderfengyun e67a80db8d add new Test
add new Test
2014-09-04 14:06:39 +08:00
hmm 47d4b97131 change filter script to testplanscript from script 2014-09-04 13:44:22 +08:00
coderfengyun 52a048a89a refactor continue
refactor continue
2014-09-04 10:43:28 +08:00
coderfengyun 6a8e50cf6f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-04 09:17:14 +08:00
coderfengyun b00cc44785 add support for schedule
add support for schedule
2014-09-04 09:17:04 +08:00
hmm 230a2e23ca list script and testplan by time desc 2014-09-03 14:30:05 +08:00
hmm 8b0e7a1985 success to filter behavior 2014-09-03 13:35:02 +08:00
hmm 4e01cf19db Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 17:26:19 +08:00
hmm 96941bb33b add filter think-time and sort the js of testplan 2014-09-02 17:25:55 +08:00
coderfengyun 3a03b2906a remove warnings
remove warnings
2014-09-02 17:24:28 +08:00
hmm fb2a04fd68 add stoprecording and stopproxyserver api 2014-09-02 15:06:17 +08:00
coderfengyun fccd5d0a27 refactor, let the schedule be the stand-alone one
refactor, let the schedule be the stand-alone one
2014-09-02 11:39:10 +08:00
hmm 1bfbbde54d Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 11:17:58 +08:00
hmm dd93e0321f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.java
	Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
	Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessager.java
2014-09-02 11:17:37 +08:00
luqiong db964183e2 modify the gettter to transient
modify the gettter to transient
2014-09-02 11:16:15 +08:00
hmm 5a6ce8a63b no creating new entity 2014-09-02 10:59:50 +08:00
hmm 3c46fdda89 add function filter type of behavior and timer 2014-09-02 10:57:50 +08:00
coderfengyun 2b3f97a605 sync 2014-09-02 10:41:46 +08:00
coderfengyun 9157b793fc add realStartTime to scenario
add realStartTime to scenario
2014-09-02 10:27:42 +08:00
hmm f3816e8304 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
2014-09-01 14:49:33 +08:00
hmm 2dcaf3664f add loadFilterTypeList api 2014-09-01 14:46:57 +08:00
hmm 7ccd47d74b add loadFilterTypeList api 2014-09-01 14:45:24 +08:00
daisyonly 7a04393a14 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-01 14:38:19 +08:00
daisyonly 6ba38aa94d edit PluginEntitiFactory.java
edit PluginEntitiFactory.java
2014-09-01 14:38:02 +08:00
coderfengyun b17334bfae Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioCo
ntext.java

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEn
gine.java

Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.j
ava

Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessage
r.java

Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/TestPlanMe
ssageTest.java
2014-09-01 11:07:30 +08:00
coderfengyun fb4e9937ea adding the TestSchedule to agent
adding the TestSchedule to agent
2014-09-01 10:13:05 +08:00
coderfengyun 4c05dd7415 refactor
refactor
2014-09-01 09:09:42 +08:00
hmm 2b77bb473b Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-01 08:53:51 +08:00
hmm 56bee56bab add startProxyServer and startRecording api 2014-09-01 08:53:38 +08:00
coderfengyun b08a7a3cf7 add async method for agentMessenger
add async method for agentMessenger
2014-08-31 21:39:04 +08:00
daisyonly 28965ed380 add input content verification
add input content verification
2014-08-29 11:24:03 +08:00
luqiong dd5160e48e change picture to base64 2014-08-28 16:41:30 +08:00
coderfengyun 0d42c3e97a refactor the tests
refactor the tests
2014-08-28 08:56:38 +08:00
coderfengyun aaf7f00759 fix gitignore problem 2014-08-28 08:49:15 +08:00
coderfengyun ef495e95be add test about the bug emerging in sampling
add test about the bug emerging in sampling
2014-08-28 08:47:02 +08:00
daisyonly 1f6f999b35 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-08-27 20:18:44 +08:00
daisyonly e28d430da8 edit PluginDomainFactory
edit PluginDomainFactory
2014-08-27 20:18:27 +08:00
luqiong 243d73bb21 edit recordFlag 2014-08-27 14:18:35 +08:00
hmm a66f0ec758 read record falg html from file 2014-08-27 10:16:20 +08:00
daisyonly 63b5cdf688 add set required in PluginFactory
add set required in PluginFactory
2014-08-26 16:30:44 +08:00