Skip to content

Commit

Permalink
Merge pull request usabilla#133 from usabilla/improve/pytest
Browse files Browse the repository at this point in the history
Treat lack of custom markers register
  • Loading branch information
renatomefi authored Oct 17, 2019
2 parents 7145934 + ea576c5 commit 9c0ce85
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions test/e2e/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def pytest_addoption(parser):
def tag(request):
return request.config.getoption("--tag")


@pytest.fixture
def container(host, tag, request):
port = '80'
Expand Down
12 changes: 12 additions & 0 deletions test/pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[pytest]
markers =
php: base php tests, should pass in all flavors
php_no_dev: php tests where only works without dev configurations
php_dev: php tests where only works with dev configurations, i.e.: Xdebug
php_cli: php tests where the sapi is cli (`php_sapi_name()`)
php_fpm: php tests where the sapi is fpm
php_fpm_exec: fpm tests where there is access to the fpm container
nginx: nginx specific tests
nginx_e2e: nginx tests where http calls are made
nginx_fpm_functional: tests where nginx has access to php fpm via fcgi
prometheus_exporter_file_e2e: tests where the nginx prometheus exporter configuration is enabled

0 comments on commit 9c0ce85

Please sign in to comment.