From 6ab046ba8f9f429377497cb4e0fc5e0595f2d0e2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 30 Apr 2020 15:43:33 -0400 Subject: [PATCH] Fix tests for #4502 --- netbox/extras/tests/test_webhooks.py | 2 +- netbox/netbox/tests/test_releases.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/netbox/extras/tests/test_webhooks.py b/netbox/extras/tests/test_webhooks.py index 06b4f7c7e..f87242404 100644 --- a/netbox/extras/tests/test_webhooks.py +++ b/netbox/extras/tests/test_webhooks.py @@ -102,7 +102,7 @@ class WebhookTest(APITestCase): request_id = uuid.uuid4() - def dummy_send(_, request): + def dummy_send(_, request, **kwargs): """ A dummy implementation of Session.send() to be used for testing. Always returns a 200 HTTP response. diff --git a/netbox/netbox/tests/test_releases.py b/netbox/netbox/tests/test_releases.py index 635a6782b..53a29a260 100644 --- a/netbox/netbox/tests/test_releases.py +++ b/netbox/netbox/tests/test_releases.py @@ -4,6 +4,7 @@ from unittest.mock import Mock, patch import requests from cacheops import CacheMiss, RedisCache +from django.conf import settings from django.test import SimpleTestCase, override_settings from packaging.version import Version from requests import Response @@ -77,7 +78,8 @@ class GetReleasesTestCase(SimpleTestCase): # Check if correct request is made dummy_request_get.assert_called_once_with( 'https://localhost/unittest/releases', - headers={'Accept': 'application/vnd.github.v3+json'} + headers={'Accept': 'application/vnd.github.v3+json'}, + proxies=settings.HTTP_PROXIES ) # Check if result is put in cache @@ -105,7 +107,8 @@ class GetReleasesTestCase(SimpleTestCase): # Check if correct request is made dummy_request_get.assert_called_once_with( 'https://localhost/unittest/releases', - headers={'Accept': 'application/vnd.github.v3+json'} + headers={'Accept': 'application/vnd.github.v3+json'}, + proxies=settings.HTTP_PROXIES ) # Check if result is put in cache @@ -137,7 +140,8 @@ class GetReleasesTestCase(SimpleTestCase): # Check if correct request is made dummy_request_get.assert_called_once_with( 'https://localhost/unittest/releases', - headers={'Accept': 'application/vnd.github.v3+json'} + headers={'Accept': 'application/vnd.github.v3+json'}, + proxies=settings.HTTP_PROXIES ) # Check if failure is put in cache