Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

More tests for the simple_* methods #16596

Merged
merged 15 commits into from
Nov 7, 2023
Merged

More tests for the simple_* methods #16596

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
42e21a4
Basic upsert tests.
clokep Nov 3, 2023
3da39af
Add basic upsert_many tests.
clokep Nov 3, 2023
a5348d5
Test insert_many and update_many.
clokep Nov 3, 2023
0edc67c
Add tests for delete_many.
clokep Nov 3, 2023
6252b31
Test select_many_batch.
clokep Nov 3, 2023
926780c
Add tests for not having iterables.
clokep Nov 3, 2023
7ac4899
Newsfragment
clokep Nov 3, 2023
ff58a47
Test simple_upsert_many with multiple rows.
clokep Nov 6, 2023
80a7f75
Avoid double space.
clokep Nov 6, 2023
9f3ba06
Clarify variable name.
clokep Nov 6, 2023
98b28b4
Add tests for emulated upserts.
clokep Nov 6, 2023
85928cf
Add postgres tests.
clokep Nov 6, 2023
1fa8fcc
Lint
clokep Nov 6, 2023
5172d8b
Fix-up asserts.
clokep Nov 7, 2023
e4957d6
Add tests for no values.
clokep Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions tests/storage/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,63 @@ def test_delete_one(self) -> Generator["defer.Deferred[object]", object, None]:
self.mock_txn.execute.assert_called_with(
"DELETE FROM tablename WHERE keycol = ?", ["Go away"]
)

@defer.inlineCallbacks
Copy link
Contributor

@DMRobertson DMRobertson Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess twisted/trial doesn't let you write test methods using async def ...? :(

Copy link
Member Author

@clokep clokep Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They do, but I think not on our lowest bound. I started testing it and got into some dependency hell and stopped.

def test_upsert(self) -> Generator["defer.Deferred[object]", object, None]:
self.mock_txn.rowcount = 1

result = yield defer.ensureDeferred(
self.datastore.db_pool.simple_upsert(
table="tablename",
keyvalues={"columnname": "oldvalue"},
values={"othercol": "newvalue"},
)
)

self.mock_txn.execute.assert_called_with(
"INSERT INTO tablename (columnname, othercol) VALUES (?, ?) ON CONFLICT (columnname) DO UPDATE SET othercol=EXCLUDED.othercol",
["oldvalue", "newvalue"],
)
self.assertTrue(result)

@defer.inlineCallbacks
def test_upsert_with_insert(
self,
) -> Generator["defer.Deferred[object]", object, None]:
self.mock_txn.rowcount = 1

result = yield defer.ensureDeferred(
self.datastore.db_pool.simple_upsert(
table="tablename",
keyvalues={"columnname": "oldvalue"},
values={"othercol": "newvalue"},
insertion_values={"thirdcol": "insertionval"},
)
)

self.mock_txn.execute.assert_called_with(
"INSERT INTO tablename (columnname, thirdcol, othercol) VALUES (?, ?, ?) ON CONFLICT (columnname) DO UPDATE SET othercol=EXCLUDED.othercol",
["oldvalue", "insertionval", "newvalue"],
)
self.assertTrue(result)

@defer.inlineCallbacks
def test_upsert_with_where(
self,
) -> Generator["defer.Deferred[object]", object, None]:
self.mock_txn.rowcount = 1

result = yield defer.ensureDeferred(
self.datastore.db_pool.simple_upsert(
table="tablename",
keyvalues={"columnname": "oldvalue"},
values={"othercol": "newvalue"},
where_clause="thirdcol IS NULL",
)
)

self.mock_txn.execute.assert_called_with(
"INSERT INTO tablename (columnname, othercol) VALUES (?, ?) ON CONFLICT (columnname) WHERE thirdcol IS NULL DO UPDATE SET othercol=EXCLUDED.othercol",
["oldvalue", "newvalue"],
)
self.assertTrue(result)