Mercurial > p > roundup > code
view test/test_postgresql.py @ 5710:0b79bfcb3312
Add support for making an idempotent POST. This allows retrying a POST
that was interrupted. It involves creating a post once only (poe) url
/rest/data/<class>/@poe/<random_token>. This url acts the same as a
post to /rest/data/<class>. However once the @poe url is used, it
can't be used for a second POST.
To make these changes:
1) Take the body of post_collection into a new post_collection_inner
function. Have post_collection call post_collection_inner.
2) Add a handler for POST to rest/data/class/@poe. This will return a
unique POE url. By default the url expires after 30 minutes. The
POE random token is only good for a specific user and is stored in
the session db.
3) Add a handler for POST to rest/data/<class>/@poe/<random token>.
The random token generated in 2 is validated for proper class (if
token is not generic) and proper user and must not have expired.
If everything is valid, call post_collection_inner to process the
input and generate the new entry.
To make recognition of 2 stable (so it's not confused with
rest/data/<:class_name>/<:item_id>), removed @ from
Routing::url_to_regex.
The current Routing.execute method stops on the first regular
expression to match the URL. Since item_id doesn't accept a POST, I
was getting 405 bad method sometimes. My guess is the order of the
regular expressions is not stable, so sometime I would get the right
regexp for /data/<class>/@poe and sometime I would get the one for
/data/<class>/<item_id>. By removing the @ from the url_to_regexp,
there was no way for the item_id case to match @poe.
There are alternate fixes we may need to look at. If a regexp matches
but the method does not, return to the regexp matching loop in
execute() looking for another match. Only once every possible match
has failed should the code return a 405 method failure.
Another fix is to implement a more sophisticated mechanism so that
@Routing.route("/data/<:class_name>/<:item_id>/<:attr_name>", 'PATCH')
has different regexps for matching <:class_name> <:item_id> and
<:attr_name>. Currently the regexp specified by url_to_regex is used
for every component.
Other fixes:
Made failure to find any props in props_from_args return an empty
dict rather than throwing an unhandled error.
Make __init__ for SimulateFieldStorageFromJson handle an empty json
doc. Useful for POSTing to rest/data/class/@poe with an empty
document.
Testing:
added testPostPOE to test/rest_common.py that I think covers
all the code that was added.
Documentation:
Add doc to rest.txt in the "Client API" section titled: Safely
Re-sending POST". Move existing section "Adding new rest endpoints" in
"Client API" to a new second level section called "Programming the
REST API". Also a minor change to the simple rest client moving the
header setting to continuation lines rather than showing one long
line.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 14 Apr 2019 21:07:11 -0400 |
| parents | fcbeff272828 |
| children | 5cb6e6b594b0 |
line wrap: on
line source
# # Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/) # This module is free software, and you may redistribute it and/or modify # under the same terms as Python, so long as this copyright message and # disclaimer are retained in their original form. # # IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR # DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING # OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. import unittest import pytest from roundup.hyperdb import DatabaseError from roundup.backends import get_backend, have_backend from .db_test_base import DBTest, ROTest, config, SchemaTest, ClassicInitTest from .db_test_base import ConcurrentDBTest, HTMLItemTest, FilterCacheTest from .db_test_base import ClassicInitBase, setupTracker, SpecialActionTest from .rest_common import TestCase as RestTestCase if not have_backend('postgresql'): # FIX: workaround for a bug in pytest.mark.skip(): # https://github.com/pytest-dev/pytest/issues/568 from .pytest_patcher import mark_class skip_postgresql = mark_class(pytest.mark.skip( reason='Skipping PostgreSQL tests: backend not available')) else: try: from roundup.backends.back_postgresql import psycopg, db_command db_command(config, 'select 1') skip_postgresql = lambda func, *args, **kwargs: func except( DatabaseError ) as msg: from .pytest_patcher import mark_class skip_postgresql = mark_class(pytest.mark.skip( reason='Skipping PostgreSQL tests: database not available')) @skip_postgresql class postgresqlOpener: if have_backend('postgresql'): module = get_backend('postgresql') def setUp(self): pass def tearDown(self): self.nuke_database() def nuke_database(self): # clear out the database - easiest way is to nuke and re-create it self.module.db_nuke(config) @skip_postgresql class postgresqlDBTest(postgresqlOpener, DBTest, unittest.TestCase): def setUp(self): postgresqlOpener.setUp(self) DBTest.setUp(self) def tearDown(self): DBTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlROTest(postgresqlOpener, ROTest, unittest.TestCase): def setUp(self): postgresqlOpener.setUp(self) ROTest.setUp(self) def tearDown(self): ROTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlConcurrencyTest(postgresqlOpener, ConcurrentDBTest, unittest.TestCase): backend = 'postgresql' def setUp(self): postgresqlOpener.setUp(self) ConcurrentDBTest.setUp(self) def tearDown(self): ConcurrentDBTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlJournalTest(postgresqlOpener, ClassicInitBase, unittest.TestCase): backend = 'postgresql' def setUp(self): postgresqlOpener.setUp(self) ClassicInitBase.setUp(self) self.tracker = setupTracker(self.dirname, self.backend) db = self.tracker.open('admin') self.id = db.issue.create(title='initial value') db.commit() db.close() def tearDown(self): try: self.db1.close() self.db2.close() except psycopg.InterfaceError as exc: if 'connection already closed' in str(exc): pass else: raise ClassicInitBase.tearDown(self) postgresqlOpener.tearDown(self) def _test_journal(self, expected_journal): id = self.id db1 = self.db1 = self.tracker.open('admin') db2 = self.db2 = self.tracker.open('admin') t1 = db1.issue.get(id, 'title') t2 = db2.issue.get(id, 'title') db1.issue.set (id, title='t1') db1.commit() db1.close() # Test testConcurrentRepeatableRead is expected to raise # an error when the db2.issue.set() call is executed. try: db2.issue.set (id, title='t2') db2.commit() finally: # Make sure that the db2 connection is closed, even when # an error is raised. db2.close() self.db = self.tracker.open('admin') journal = self.db.getjournal('issue', id) for n, line in enumerate(journal): self.assertEqual(line[4], expected_journal[n]) def testConcurrentReadCommitted(self): expected_journal = [ {}, {'title': 'initial value'}, {'title': 'initial value'} ] self._test_journal(expected_journal) def testConcurrentRepeatableRead(self): self.tracker.config.RDBMS_ISOLATION_LEVEL='repeatable read' exc = self.module.TransactionRollbackError self.assertRaises(exc, self._test_journal, []) @skip_postgresql class postgresqlHTMLItemTest(postgresqlOpener, HTMLItemTest, unittest.TestCase): backend = 'postgresql' def setUp(self): postgresqlOpener.setUp(self) HTMLItemTest.setUp(self) def tearDown(self): HTMLItemTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlFilterCacheTest(postgresqlOpener, FilterCacheTest, unittest.TestCase): backend = 'postgresql' def setUp(self): postgresqlOpener.setUp(self) FilterCacheTest.setUp(self) def tearDown(self): FilterCacheTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlSchemaTest(postgresqlOpener, SchemaTest, unittest.TestCase): def setUp(self): postgresqlOpener.setUp(self) SchemaTest.setUp(self) def tearDown(self): SchemaTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlClassicInitTest(postgresqlOpener, ClassicInitTest, unittest.TestCase): backend = 'postgresql' def setUp(self): postgresqlOpener.setUp(self) ClassicInitTest.setUp(self) def tearDown(self): ClassicInitTest.tearDown(self) postgresqlOpener.tearDown(self) from .session_common import SessionTest @skip_postgresql class postgresqlSessionTest(postgresqlOpener, SessionTest, unittest.TestCase): def setUp(self): postgresqlOpener.setUp(self) SessionTest.setUp(self) def tearDown(self): SessionTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlSpecialActionTestCase(postgresqlOpener, SpecialActionTest, unittest.TestCase): backend = 'postgresql' def setUp(self): postgresqlOpener.setUp(self) SpecialActionTest.setUp(self) def tearDown(self): SpecialActionTest.tearDown(self) postgresqlOpener.tearDown(self) @skip_postgresql class postgresqlRestTest (RestTestCase, unittest.TestCase): backend = 'postgresql' # vim: set et sts=4 sw=4 :
