From cb3255715af97c928581b730a5b190136e843ed3 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 22 Mar 2014 13:36:14 +0100 Subject: [PATCH] xprocess expects PHP to have decent performance --- tests/storage/dav/conftest.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/storage/dav/conftest.py b/tests/storage/dav/conftest.py index c269c5d..8ab81f3 100644 --- a/tests/storage/dav/conftest.py +++ b/tests/storage/dav/conftest.py @@ -9,16 +9,31 @@ import os import pytest +import requests +import requests.exceptions +import time dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale_filesystem' php_sh = os.path.abspath(os.path.join( os.path.dirname(__file__), '../../../owncloud-testserver/php.sh' )) + +def wait(): + for i in range(10): + try: + requests.get('http://127.0.0.1:8080/') + except requests.exceptions.HTTPException: + time.sleep(1) + else: + return True + return False + + if dav_server == 'owncloud': @pytest.fixture(autouse=True) def start_owncloud_server(xprocess): def preparefunc(cwd): - return 'Listening on', ['sh', php_sh] + return wait, ['sh', php_sh] xprocess.ensure('owncloud_server', preparefunc)