diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da174d7..d8029b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,8 @@ stages: - pytest --verbose --cov-config setup.cfg artifacts: paths: - - coverage_report/* + - test-report/* + coverage: '/TOTAL.*\s+(\d+\%)/' # Test with python 3.6 test:3.6: @@ -44,3 +45,5 @@ sonar: allow_failure: true dependencies: - test:3.9 + rules: + - when: always diff --git a/setup.cfg b/setup.cfg index fcd8a9e..cd8d958 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,8 @@ [tool:pytest] addopts = --cov=sevenbridges - --cov-report=xml:coverage_report/coverage.xml + --cov-report=html:test-report/htmlcov + --cov-report=xml:test-report/coverage.xml --cov-report=term [run] diff --git a/sevenbridges/http/client.py b/sevenbridges/http/client.py index ea3710f..d2f23e6 100644 --- a/sevenbridges/http/client.py +++ b/sevenbridges/http/client.py @@ -112,6 +112,7 @@ def config_vars(profiles, advance_access): def mask_secrets(request_data): masked = copy.deepcopy(request_data) masked['headers']['X-SBG-Auth-Token'] = '*****' + masked['headers']['X-SBG-Session-Id'] = '*****' return masked diff --git a/sonar-project.properties b/sonar-project.properties index 2b173c2..61b9ece 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,11 +2,11 @@ sonar.projectKey=sevenbridges sonar.projectName=sevenbridges-python sonar.sources=sevenbridges -sonar.exclusions=tests/**/*.py,coverage_report/*.xml +sonar.exclusions=tests/**/*.py,test-report/*.xml sonar.test=tests/**/*.py -sonar.python.coverage.reportPaths=coverage_report/coverage.xml +sonar.python.coverage.reportPaths=test-report/coverage.xml sonar.coverage.exclusions=tests/* sonar.issue.ignore.multicriteria=r1