github/sprockets-postgres
1
0
Fork 0
mirror of https://github.com/sprockets/sprockets-postgres.git synced 2024-11-14 19:29:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13 from nvllsvm/dep_stuff

Browse source 
Fix tests, add support for aiodns>3,<4
This commit is contained in:
Gavin M. Roy 2022-06-28 11:39:17 -04:00 committed by GitHub
commit c2a2f54c61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/testing.yaml vendored
View file

@ -8,6 +8,7 @@ on:
- '*.md' - '*.md'
- '*.rst' - '*.rst'
tags-ignore: ["*"] tags-ignore: ["*"]
pull_request:
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
setup.cfg
View file

@ -35,7 +35,7 @@ keywords =
include_package_data = True include_package_data = True
install_requires = install_requires =
aiopg>=1.0.0,<2 aiopg>=1.0.0,<2
aiodns>=2,<3 aiodns>=2,<4
sprockets.http>=2.1.1,<3 sprockets.http>=2.1.1,<3
tornado>=6,<7 tornado>=6,<7
py_modules = py_modules =

25
tests.py
View file

@ -415,7 +415,7 @@ class RequestHandlerMixinTestCase(TestCase):
data = json.loads(response.body) data = json.loads(response.body)
self.assertEqual(data['status'], 'unavailable') self.assertEqual(data['status'], 'unavailable')
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_status_error(self, execute): def test_postgres_status_error(self, execute):
execute.side_effect = asyncio.TimeoutError() execute.side_effect = asyncio.TimeoutError()
response = self.fetch('/status') response = self.fetch('/status')
@ -428,7 +428,7 @@ class RequestHandlerMixinTestCase(TestCase):
self.assertIsInstance( self.assertIsInstance(
uuid.UUID(json.loads(response.body)['value']), uuid.UUID) uuid.UUID(json.loads(response.body)['value']), uuid.UUID)
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_error(self, execute): def test_postgres_error(self, execute):
execute.side_effect = asyncio.TimeoutError execute.side_effect = asyncio.TimeoutError
response = self.fetch('/error') response = self.fetch('/error')
@ -556,7 +556,7 @@ class RequestHandlerMixinTestCase(TestCase):
data = json.loads(response.body) data = json.loads(response.body)
self.assertEqual(data['count'], 5) self.assertEqual(data['count'], 5)
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_timeout_error_when_overriding_on_postgres_error(self, execute): def test_timeout_error_when_overriding_on_postgres_error(self, execute):
execute.side_effect = asyncio.TimeoutError execute.side_effect = asyncio.TimeoutError
response = self.fetch('/timeout-error') response = self.fetch('/timeout-error')
@ -566,7 +566,7 @@ class RequestHandlerMixinTestCase(TestCase):
response = self.fetch('/unhandled-exception') response = self.fetch('/unhandled-exception')
self.assertEqual(response.code, 422) self.assertEqual(response.code, 422)
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_execute_timeout_error(self, execute): def test_postgres_execute_timeout_error(self, execute):
execute.side_effect = asyncio.TimeoutError() execute.side_effect = asyncio.TimeoutError()
response = self.fetch('/pdexecute?value=1') response = self.fetch('/pdexecute?value=1')
@ -574,7 +574,7 @@ class RequestHandlerMixinTestCase(TestCase):
problem = json.loads(response.body) problem = json.loads(response.body)
self.assertEqual(problem['title'], 'Query Timeout') self.assertEqual(problem['title'], 'Query Timeout')
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_execute_unique_violation(self, execute): def test_postgres_execute_unique_violation(self, execute):
execute.side_effect = errors.UniqueViolation() execute.side_effect = errors.UniqueViolation()
response = self.fetch('/pdexecute?value=1') response = self.fetch('/pdexecute?value=1')
@ -582,7 +582,7 @@ class RequestHandlerMixinTestCase(TestCase):
problem = json.loads(response.body) problem = json.loads(response.body)
self.assertEqual(problem['title'], 'Unique Violation') self.assertEqual(problem['title'], 'Unique Violation')
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_execute_error(self, execute): def test_postgres_execute_error(self, execute):
execute.side_effect = psycopg2.Error() execute.side_effect = psycopg2.Error()
response = self.fetch('/pdexecute?value=1') response = self.fetch('/pdexecute?value=1')
@ -590,7 +590,7 @@ class RequestHandlerMixinTestCase(TestCase):
problem = json.loads(response.body) problem = json.loads(response.body)
self.assertEqual(problem['title'], 'Database Error') self.assertEqual(problem['title'], 'Database Error')
@mock.patch('aiopg.cursor.Cursor.fetchone') @mock.patch('aiopg.Cursor.fetchone')
def test_postgres_programming_error(self, fetchone): def test_postgres_programming_error(self, fetchone):
fetchone.side_effect = psycopg2.ProgrammingError() fetchone.side_effect = psycopg2.ProgrammingError()
response = self.fetch('/pdexecute?value=1') response = self.fetch('/pdexecute?value=1')
@ -609,28 +609,28 @@ class HTTPErrorTestCase(TestCase):
sprockets_postgres.problemdetails = self._problemdetails sprockets_postgres.problemdetails = self._problemdetails
super().tearDown() super().tearDown()
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_execute_timeout_error(self, execute): def test_postgres_execute_timeout_error(self, execute):
execute.side_effect = asyncio.TimeoutError() execute.side_effect = asyncio.TimeoutError()
response = self.fetch('/execute?value=1') response = self.fetch('/execute?value=1')
self.assertEqual(response.code, 500) self.assertEqual(response.code, 500)
self.assertIn(b'Query Timeout', response.body) self.assertIn(b'Query Timeout', response.body)
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_execute_unique_violation(self, execute): def test_postgres_execute_unique_violation(self, execute):
execute.side_effect = errors.UniqueViolation() execute.side_effect = errors.UniqueViolation()
response = self.fetch('/execute?value=1') response = self.fetch('/execute?value=1')
self.assertEqual(response.code, 409) self.assertEqual(response.code, 409)
self.assertIn(b'Unique Violation', response.body) self.assertIn(b'Unique Violation', response.body)
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_execute_error(self, execute): def test_postgres_execute_error(self, execute):
execute.side_effect = psycopg2.Error() execute.side_effect = psycopg2.Error()
response = self.fetch('/execute?value=1') response = self.fetch('/execute?value=1')
self.assertEqual(response.code, 500) self.assertEqual(response.code, 500)
self.assertIn(b'Database Error', response.body) self.assertIn(b'Database Error', response.body)
@mock.patch('aiopg.cursor.Cursor.fetchone') @mock.patch('aiopg.Cursor.fetchone')
def test_postgres_programming_error(self, fetchone): def test_postgres_programming_error(self, fetchone):
fetchone.side_effect = psycopg2.ProgrammingError() fetchone.side_effect = psycopg2.ProgrammingError()
response = self.fetch('/execute?value=1') response = self.fetch('/execute?value=1')
@ -650,7 +650,7 @@ class HTTPErrorTestCase(TestCase):
class NoMixinTestCase(TestCase): class NoMixinTestCase(TestCase):
@mock.patch('aiopg.cursor.Cursor.execute') @mock.patch('aiopg.Cursor.execute')
def test_postgres_cursor_raises(self, execute): def test_postgres_cursor_raises(self, execute):
execute.side_effect = psycopg2.ProgrammingError() execute.side_effect = psycopg2.ProgrammingError()
response = self.fetch('/no-mixin') response = self.fetch('/no-mixin')
@ -743,7 +743,6 @@ class SRVTestCase(asynctest.TestCase):
obj = Application() obj = Application()
result = await obj._resolve_srv('_xmpp-server._tcp.google.com') result = await obj._resolve_srv('_xmpp-server._tcp.google.com')
self.assertIsInstance(result[0], pycares.ares_query_srv_result) self.assertIsInstance(result[0], pycares.ares_query_srv_result)
self.assertGreater(result[0].ttl, 0)
async def test_srv_error(self): async def test_srv_error(self):
obj = Application() obj = Application()