Skip to content

Commit

Permalink
Merge 60d0fd9 into 0748d61
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlaney
jlaney committed Feb 11, 2024
2 parents 0748d61 + 60d0fd9 commit 2969059
Show file tree
Hide file tree
Showing 17 changed files with 145 additions and 138 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
RUN_SSL_TESTS: 1
run: |
python -m compileall ${APP_NAME}/
coverage run ${APP_NAME}/test.py -v
python -Wd -m coverage run ${APP_NAME}/test.py -v
- name: Report Test Coverage
if: matrix.python-version == env.COVERAGE_PYTHON_VERSION
Expand Down
58 changes: 29 additions & 29 deletions restclients_core/tests/dao_implementation/test_backend.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,23 @@ def setUp(self):

def test_get(self):
response = TDAO().getURL('/ok')
self.assertEquals(response.data, 'ok - GET')
self.assertEqual(response.data, 'ok - GET')

def test_post(self):
response = TDAO().postURL('/ok')
self.assertEquals(response.data, 'ok - POST')
self.assertEqual(response.data, 'ok - POST')

def test_put(self):
response = TDAO().putURL('/ok', {}, '')
self.assertEquals(response.data, 'ok - PUT')
self.assertEqual(response.data, 'ok - PUT')

def test_delete(self):
response = TDAO().deleteURL('/ok')
self.assertEquals(response.data, 'ok - DELETE')
self.assertEqual(response.data, 'ok - DELETE')

def test_patch(self):
response = TDAO().patchURL('/ok', {}, '')
self.assertEquals(response.data, 'ok - PATCH')
self.assertEqual(response.data, 'ok - PATCH')

def test_error_level1(self):
self.assertRaises(ImproperlyConfigured, E1DAO().getURL, '/ok')
Expand All @@ -83,34 +83,34 @@ def test_error_level2(self):
RESTCLIENTS_BAR=True)
def test_service_settings(self):
dao = TDAO()
self.assertEquals(dao.get_setting('FOO'), False)
self.assertEquals(dao.get_setting('BAR'), True)
self.assertEqual(dao.get_setting('FOO'), False)
self.assertEqual(dao.get_setting('BAR'), True)

self.assertEquals(dao.get_service_setting('FOO'), True)
self.assertEquals(dao.get_service_setting('BAR'), True)
self.assertEqual(dao.get_service_setting('FOO'), True)
self.assertEqual(dao.get_service_setting('BAR'), True)

@skipUnless(hasattr(TestCase, 'assertLogs'), 'Python < 3.4')
@override_settings(RESTCLIENTS_TIMING_LOG_ENABLED=True,
RESTCLIENTS_TIMING_LOG_RATE=1.0)
def test_log(self):
with self.assertLogs('restclients_core.dao', level='INFO') as cm:
response = TDAO().getURL('/ok')
self.assertEquals(len(cm.output), 1)
self.assertEqual(len(cm.output), 1)
(msg, time) = cm.output[0].split(' time:')
self.assertEquals(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:GET url:/ok status:200 from_cache:no'
' cache_class:None')
self.assertEqual(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:GET url:/ok status:200 from_cache:no'
' cache_class:None')
self.assertGreater(float(time), 0)

with self.assertLogs('restclients_core.dao', level='INFO') as cm:
response = TDAO().putURL('/api', {}, '')
self.assertEquals(len(cm.output), 1)
self.assertEqual(len(cm.output), 1)
(msg, time) = cm.output[0].split(' time:')
self.assertEquals(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:PUT url:/api status:200 from_cache:no'
' cache_class:None')
self.assertEqual(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:PUT url:/api status:200 from_cache:no'
' cache_class:None')
self.assertGreater(float(time), 0)

@skipUnless(hasattr(TestCase, 'assertLogs'), 'Python < 3.4')
Expand All @@ -123,23 +123,23 @@ def test_log_cache(self):
# Cached response
with self.assertLogs('restclients_core.dao', level='INFO') as cm:
response = TDAO().getURL('/ok')
self.assertEquals(len(cm.output), 1)
self.assertEqual(len(cm.output), 1)
(msg, time) = cm.output[0].split(' time:')
self.assertEquals(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:GET url:/ok status:200 from_cache:yes'
' cache_class:TCache')
self.assertEqual(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:GET url:/ok status:200 from_cache:yes'
' cache_class:TCache')
self.assertGreater(float(time), 0)

# Cached post response
with self.assertLogs('restclients_core.dao', level='INFO') as cm:
response = TDAO().getURL('/ok2')
self.assertEquals(len(cm.output), 1)
self.assertEqual(len(cm.output), 1)
(msg, time) = cm.output[0].split(' time:')
self.assertEquals(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:GET url:/ok2 status:404 from_cache:yes'
' cache_class:TCache')
self.assertEqual(msg,
'INFO:restclients_core.dao:service:backend_test '
'method:GET url:/ok2 status:404 from_cache:yes'
' cache_class:TCache')
self.assertGreater(float(time), 0)

@override_settings(RESTCLIENTS_DAO_CACHE_CLASS=(
Expand Down
34 changes: 18 additions & 16 deletions restclients_core/tests/dao_implementation/test_live.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,26 +84,27 @@ def get_default_service_setting(self, key):
class TestLive(TestCase):
def test_found_resource(self):
response = TDAO().getURL('/ok', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.data, b'ok')
self.assertEquals(response.headers["X-Custom-Header"], "header-test")
self.assertEquals(response.getheader("X-Custom-Header"), "header-test")
self.assertEqual(response.status, 200)
self.assertEqual(response.data, b'ok')
self.assertEqual(response.headers["X-Custom-Header"], "header-test")
self.assertEqual(response.headers.get("X-Custom-Header"),
"header-test")

def test_clear_cached_response(self):
self.assertIsNone(TDAO().clear_cached_response('/ok'))

def test_missing_resource(self):
response = TDAO().getURL('/missing.json', {})
self.assertEquals(response.status, 404)
self.assertEqual(response.status, 404)

def test_other_status(self):
response = TDAO().getURL('/403', {})
self.assertEquals(response.status, 403)
self.assertEqual(response.status, 403)

def test_one_redirect(self):
response = TDAO().getURL('/301', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.data, b'ok')
self.assertEqual(response.status, 200)
self.assertEqual(response.data, b'ok')

def test_multiple_redirects(self):
self.assertRaises(DataFailureException, TDAO().getURL, '/redirect', {})
Expand Down Expand Up @@ -158,15 +159,16 @@ def test_settings_defaults(self):
class TestLiveSSL(TestCase):
def test_ssl_found_resource(self):
response = SSLTDAO().getURL('/ok', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.data, b'ok: ')
self.assertEquals(response.headers["X-Custom-Header"], "header-test")
self.assertEquals(response.getheader("X-Custom-Header"), "header-test")
self.assertEqual(response.status, 200)
self.assertEqual(response.data, b'ok: ')
self.assertEqual(response.headers["X-Custom-Header"], "header-test")
self.assertEqual(response.headers.get("X-Custom-Header"),
"header-test")

def test_ssl_client_cert(self):
response = SSLClientCertTDAO().getURL('/ok', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.data, b'ok: my.app')
self.assertEqual(response.status, 200)
self.assertEqual(response.data, b'ok: my.app')

def test_ssl_non_validated_cert(self):
self.assertRaises(DataFailureException, SSLBadFailTDAO().getURL, '/')
Expand All @@ -179,5 +181,5 @@ def test_ssl_non_validated_cert(self):

def test_ssl_non_valid_ignore(self):
response = SSLBadIgnoreTDAO().getURL('/ok', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.data, b'ok')
self.assertEqual(response.status, 200)
self.assertEqual(response.data, b'ok')
43 changes: 22 additions & 21 deletions restclients_core/tests/dao_implementation/test_mock.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,66 +20,67 @@ def service_mock_paths(self):
class TestMock(TestCase):
def test_found_resource(self):
response = TDAO().getURL('/found.json', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.read(), b'{"OK": true }\n')
self.assertEqual(response.status, 200)
self.assertEqual(response.read(), b'{"OK": true }\n')

def test_missing_resource(self):
response = TDAO().getURL('/missing.json', {})
self.assertEquals(response.status, 404)
self.assertEqual(response.status, 404)

def test_file_headers(self):
response = TDAO().getURL('/with_headers.json', {})
self.assertEquals(response.status, 202)
self.assertEqual(response.status, 202)

self.assertEquals(response.headers["Custom"], "My Custom Value")
self.assertEquals(response.getheader("Custom"), "My Custom Value")
self.assertEqual(response.headers["Custom"], "My Custom Value")
self.assertEqual(response.headers.get("Custom"),
"My Custom Value")

def test_plain_file_headers(self):
response = TDAO().getURL('/with_only_headers.json', {})
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

self.assertEquals(response.headers["Custom2"], "My Custom Value 2")
self.assertEqual(response.headers["Custom2"], "My Custom Value 2")

def test_registered_paths(self):
response = TDAO().getURL('/override.json', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.read(), b'{"override": false }\n')
self.assertEqual(response.status, 200)
self.assertEqual(response.read(), b'{"override": false }\n')

override = abspath(dirname(__file__) + "/resource_override/")
MockDAO.register_mock_path(override)

response = TDAO().getURL('/override.json', {})
self.assertEquals(response.status, 200)
self.assertEquals(response.read(), b'{"override": true }\n')
self.assertEqual(response.status, 200)
self.assertEqual(response.read(), b'{"override": true }\n')

def test_binary_data(self):
response = TDAO().getURL('/image.jpg', {})
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

def test_params_none(self):
response = TDAO().getURL('/search?'
'first=a&second=b.POST')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

def test_out_of_order_params(self):
response = TDAO().getURL('/search?'
'first=a&second=b&third=c&fourth=d')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

def test_extra_params(self):
response = TDAO().getURL('/search?'
'first=a&second=b&third=c&fourth=d&fifth=e')
self.assertEquals(response.status, 404)
self.assertEqual(response.status, 404)

def test_quoted_params(self):
response = TDAO().getURL('/search?'
'first=a&second=a%3Ab%3Ac')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

def test_no_body_file(self):
response = TDAO().getURL('/search?'
'first=abc')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

def test_multiple_files(self):
with self.assertRaises(DataFailureException):
Expand All @@ -88,13 +89,13 @@ def test_multiple_files(self):

def test_quote_in_file_path(self):
response = TDAO().getURL('/test%3folder/test.json')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

def test_quote_in_file_path_and_file(self):
response = TDAO().getURL('/test%3folder/test.json')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)

@skipIf(True, "I'm not sure that this case actually exists - ezturner")
def test_quote_in_file_path_and_url_but_not_file(self):
response = TDAO().getURL('/test%3folder/test%3man.json')
self.assertEquals(response.status, 200)
self.assertEqual(response.status, 200)
62 changes: 31 additions & 31 deletions restclients_core/tests/models/test_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@ class ModelTest(models.Model):
model.times = now.time()
model.urls = "http://example.com/path"

self.assertEquals(model.bools, True)
self.assertEquals(model.chars, "Char value")
self.assertEquals(model.dates, now.date())
self.assertEquals(model.datetimes, now)
self.assertEquals(model.decimals, 12.1)
self.assertEquals(model.floats, 1.2312)
self.assertEquals(model.ints, 21)
self.assertEquals(model.nullbools, False)
self.assertEquals(model.posints, 113234234)
self.assertEquals(model.possmalls, 10)
self.assertEquals(model.slugs, "ok")
self.assertEquals(model.smallints, -1)
self.assertEquals(model.texts, "text string")
self.assertEquals(model.texts2, "making sure fields are different")
self.assertEquals(model.times, now.time())
self.assertEquals(model.urls, "http://example.com/path")
self.assertEqual(model.bools, True)
self.assertEqual(model.chars, "Char value")
self.assertEqual(model.dates, now.date())
self.assertEqual(model.datetimes, now)
self.assertEqual(model.decimals, 12.1)
self.assertEqual(model.floats, 1.2312)
self.assertEqual(model.ints, 21)
self.assertEqual(model.nullbools, False)
self.assertEqual(model.posints, 113234234)
self.assertEqual(model.possmalls, 10)
self.assertEqual(model.slugs, "ok")
self.assertEqual(model.smallints, -1)
self.assertEqual(model.texts, "text string")
self.assertEqual(model.texts2, "making sure fields are different")
self.assertEqual(model.times, now.time())
self.assertEqual(model.urls, "http://example.com/path")

del (model.urls)
self.assertIsNone(model.urls)
Expand All @@ -92,10 +92,10 @@ class ModelTest(models.Model):
m2.f1 = "m2_f1"
m2.f2 = "m2_f2"

self.assertEquals(m1.f1, "m1_f1")
self.assertEquals(m1.f2, "m1_f2")
self.assertEquals(m2.f1, "m2_f1")
self.assertEquals(m2.f2, "m2_f2")
self.assertEqual(m1.f1, "m1_f1")
self.assertEqual(m1.f2, "m1_f2")
self.assertEqual(m2.f1, "m2_f1")
self.assertEqual(m2.f2, "m2_f2")

def test_init_fields(self):
class ModelTest(models.Model):
Expand All @@ -104,8 +104,8 @@ class ModelTest(models.Model):

m1 = ModelTest(f1="Input value", f2=True)

self.assertEquals(m1.f1, "Input value")
self.assertEquals(m1.f2, True)
self.assertEqual(m1.f1, "Input value")
self.assertEqual(m1.f2, True)

def test_default_values(self):
class ModelTest(models.Model):
Expand All @@ -115,11 +115,11 @@ class ModelTest(models.Model):
m1 = ModelTest()
m2 = ModelTest(f1="override")

self.assertEquals(m1.f1, "Has Default")
self.assertEquals(m1.f2, None)
self.assertEqual(m1.f1, "Has Default")
self.assertEqual(m1.f2, None)

self.assertEquals(m2.f1, "override")
self.assertEquals(m2.f2, None)
self.assertEqual(m2.f1, "override")
self.assertEqual(m2.f2, None)

def test_char_choices(self):
CHOICES = (('ok', 'OK!'), ('not_ok', 'Not OK!'))
Expand All @@ -129,12 +129,12 @@ class ModelTest(models.Model):
f2 = models.CharField(default='ok2')

m1 = ModelTest()
self.assertEquals(m1.f1, 'ok')
self.assertEquals(m1.get_f1_display(), 'OK!')
self.assertEqual(m1.f1, 'ok')
self.assertEqual(m1.get_f1_display(), 'OK!')

m1.f1 = 'not_ok'
self.assertEquals(m1.f1, 'not_ok')
self.assertEquals(m1.get_f1_display(), 'Not OK!')
self.assertEqual(m1.f1, 'not_ok')
self.assertEqual(m1.get_f1_display(), 'Not OK!')

with self.assertRaises(AttributeError):
m1.get_f2_display()
Expand Down Expand Up @@ -167,4 +167,4 @@ def match_count():
gc.collect()
after_2 = match_count()

self.assertEquals(starting, after_2)
self.assertEqual(starting, after_2)

0 comments on commit 2969059

Please sign in to comment.