Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Commit

Permalink
remove the extra / in the root
Browse files Browse the repository at this point in the history
  • Loading branch information
almet committed Aug 2, 2012
1 parent 3c97e3e commit 398ccfe
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .marteau.yml
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MarketPlace name: MarketPlace
test: MarketplaceTest.test_index test: MarketplaceTest.test_everything
script: loadtest.py script: loadtest.py
xml: simple-bench.xml xml: simple-bench.xml
nodes: nodes:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test:
bin/fl-run-test loadtest.py bin/fl-run-test loadtest.py


bench: bench:
bin/fl-run-bench loadtest.py NodeAssignmentTest.test_category bin/fl-run-bench loadtest.py MarketplaceTest.test_everything


report: report:
bin/fl-build-report --html -o html simple-bench.xml bin/fl-build-report --html -o html simple-bench.xml
5 changes: 3 additions & 2 deletions MarketplaceTest.conf
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title=Marketplace funkload test
description=Simple users test description=Simple users test


# the server url to test # the server url to test
url = https://marketplace.allizom.org/ url = https://marketplace.allizom.org


vusers = 10 vusers = 10


Expand Down Expand Up @@ -47,7 +47,8 @@ sleep_time_max = 0
[bench] [bench]


# cycles = list of cycles with their number of concurrent users # cycles = list of cycles with their number of concurrent users
cycles = 10:10:10 cycles = 300:300:300
#cycles = 30:30:30
#:10:20:30:40:50 #:10:20:30:40:50


# duration = duration of a cycle in seconds # duration = duration of a cycle in seconds
Expand Down
6 changes: 6 additions & 0 deletions loadtest.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ def categories(self):
def test_index(self): def test_index(self):
self.get_all('/') self.get_all('/')


def test_everything(self):
self.test_index()
self.test_search()
self.test_category()
self.test_app_detail()

def test_search(self): def test_search(self):
# make a request that returning all the apps registered in the # make a request that returning all the apps registered in the
# marketplace. # marketplace.
Expand Down

0 comments on commit 398ccfe

Please sign in to comment.