External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 17:37:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix up a few test and lint errors related to external logging

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-08 14:40:26 -04:00
committed by Christian Adams
parent b942fde59a
commit 39648b4f0b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/conf/views.py
View File

@@ -184,7 +184,7 @@ class SettingLoggingTest(GenericAPIView):
# if http/https by this point, domain is reacheable # if http/https by this point, domain is reacheable
return Response(status=status.HTTP_202_ACCEPTED) return Response(status=status.HTTP_202_ACCEPTED)
if protocol is 'udp': if protocol == 'udp':
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
else: else:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

2
awx/main/tests/functional/api/test_settings.py
View File

@@ -241,7 +241,7 @@ def test_logging_aggregator_connection_test_requires_superuser(post, alice):
@pytest.mark.django_db @pytest.mark.django_db
def test_logging_aggregator_connection_test_not_enabled(post, admin): def test_logging_aggregator_connection_test_not_enabled(post, admin):
url = reverse('api:setting_logging_test') url = reverse('api:setting_logging_test')
resp = post(url, {}, user=admin, expect=400) resp = post(url, {}, user=admin, expect=409)
assert 'Logging not enabled' in resp.data.get('error') assert 'Logging not enabled' in resp.data.get('error')