Skip to content

Commit

Permalink
fixes service setting test
Browse files Browse the repository at this point in the history
  • Loading branch information
jlaney committed Jan 30, 2018
1 parent 17189bc commit 2630f22
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -7,7 +7,7 @@ python:
- '3.6'
before_script:
- pip install -e .
- pip install pep8
- pip install pycodestyle
- pip install nose2
- pip install coverage
- pip install python-coveralls
Expand All @@ -16,7 +16,7 @@ before_script:
- python travis-ci/live_ssl_server.py &
- python travis-ci/live_ssl_bad_server.py &
script:
- pep8 restclients_core
- pycodestyle restclients_core
- python -m compileall restclients_core/
- RUN_LIVE_TESTS=1 RUN_SSL_TESTS=1 coverage run restclients_core/test.py -v
after_script:
Expand All @@ -32,4 +32,4 @@ deploy:
secure: b5gXiqGTuU7DFWYbs6WU7QZPZf2hIJgSk8kGcqNCLBUu/S/Xy8l0FqmheuQPxzzDyi7/RB+MTwC2g5SjmlUqs95YGCKxnSHGt1uUgK4M1zSALUa4SOmpyX50SA73UI2FnX0QLdK3TQhubaBY9bBR3BRd9SNEzSeSCqKA5l8OA6RRTTHxdqKK9mA/nSHz9Khvqx6weIk9+V3ma5dIu06LPDlBmiLqL4JpBw0VXO/izh3gn3CZMUTo7EFOJmh0wW6+4PIstG7paluhgYUO1TasBsGNyV3EVqTxVMAupWhU3542RCdpwApm+/KPljiaFrfgW6QgFa0CgzR2zzGlQkOtD+GgED1RRP0TjyAUtrh19OGP2q/SbZBvO4yohYxwoecepmoXWNHnMaQ1WRK/MEk73pvfMWWyXU9jY4VJP3ogSAz4ACraz68hJ0PSW4yQt5E1iGkUGs8M0SKWWPRUWvz07d7HXCyzIlwxjKa6G4+nb/O3UM+mYoMhemtmz5Gde0r/KtIJKEjtbB8khV8YVxAipzu+6io/qZcUsQX9V0WIdxGQZsEGDm0JICHy+IgD71LWkSco0QcrOZDWN+A5eWfIj48TmzyljAd55uswuMaTpGigpbFGUTdco6jFo8xCqC0PzuLAHGTQRwe1rbnY9G435yqXXKKQoPHTB+94tB3c+8w=
on:
tags: true
python: '3.5'
python: '3.6'
2 changes: 1 addition & 1 deletion restclients_core/tests/test_timing_log.py
Expand Up @@ -34,7 +34,7 @@ def test_log_date_range(self):
@skipUnless(hasattr(TestCase, 'assertLogs'), 'Python < 3.4')
@override_settings(RESTCLIENTS_TIMING_LOG_ENABLED=False,
RESTCLIENTS_TIMING_LOG_RATE=1.0,
BACKEND_TEST_TIMING_LOG_ENABLED=True)
RESTCLIENTS_BACKEND_TEST_TIMING_LOG_ENABLED=True)
def test_per_service_config(self):
with self.assertLogs('restclients_core.dao', level='INFO') as cm:
response = TDAO().getURL('/ok')
Expand Down

0 comments on commit 2630f22

Please sign in to comment.