github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some failing tests, refs #1855

Browse source
This commit is contained in:
Simon Willison 2022-12-12 21:00:40 -08:00
commit 260fbb598e
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/test_cli.py
View file

@ -138,6 +138,7 @@ def test_metadata_yaml():
settings=[], settings=[],
secret=None, secret=None,
root=False, root=False,
token=None,
version_note=None, version_note=None,
get=None, get=None,
help_settings=False, help_settings=False,

36
tests/test_permissions.py
View file

@ -692,7 +692,9 @@ PermMetadataTestCase = collections.namedtuple(
# create-table on database - no resource specified # create-table on database - no resource specified
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": {"db1": {"permissions": {"create-table": {"id": "user"}}}} "databases": {
"perms_ds_one": {"permissions": {"create-table": {"id": "user"}}}
}
}, },
actor={"id": "user"}, actor={"id": "user"},
action="create-table", action="create-table",
@ -702,11 +704,13 @@ PermMetadataTestCase = collections.namedtuple(
# create-table on database # create-table on database
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": {"db1": {"permissions": {"create-table": {"id": "user"}}}} "databases": {
"perms_ds_one": {"permissions": {"create-table": {"id": "user"}}}
}
}, },
actor={"id": "user"}, actor={"id": "user"},
action="create-table", action="create-table",
resource="db1", resource="perms_ds_one",
expected_result=True, expected_result=True,
), ),
# insert-row on root, wrong actor # insert-row on root, wrong actor
@ -714,7 +718,7 @@ PermMetadataTestCase = collections.namedtuple(
metadata={"permissions": {"insert-row": {"id": "user"}}}, metadata={"permissions": {"insert-row": {"id": "user"}}},
actor={"id": "user2"}, actor={"id": "user2"},
action="insert-row", action="insert-row",
resource=("db1", "t1"), resource=("perms_ds_one", "t1"),
expected_result=False, expected_result=False,
), ),
# insert-row on root, right actor # insert-row on root, right actor
@ -722,24 +726,26 @@ PermMetadataTestCase = collections.namedtuple(
metadata={"permissions": {"insert-row": {"id": "user"}}}, metadata={"permissions": {"insert-row": {"id": "user"}}},
actor={"id": "user"}, actor={"id": "user"},
action="insert-row", action="insert-row",
resource=("db1", "t1"), resource=("perms_ds_one", "t1"),
expected_result=True, expected_result=True,
), ),
# insert-row on database # insert-row on database
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": {"db1": {"permissions": {"insert-row": {"id": "user"}}}} "databases": {
"perms_ds_one": {"permissions": {"insert-row": {"id": "user"}}}
}
}, },
actor={"id": "user"}, actor={"id": "user"},
action="insert-row", action="insert-row",
resource="db1", resource="perms_ds_one",
expected_result=True, expected_result=True,
), ),
# insert-row on table, wrong table # insert-row on table, wrong table
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": { "databases": {
"db1": { "perms_ds_one": {
"tables": { "tables": {
"t1": {"permissions": {"insert-row": {"id": "user"}}} "t1": {"permissions": {"insert-row": {"id": "user"}}}
} }
@ -748,14 +754,14 @@ PermMetadataTestCase = collections.namedtuple(
}, },
actor={"id": "user"}, actor={"id": "user"},
action="insert-row", action="insert-row",
resource=("db1", "t2"), resource=("perms_ds_one", "t2"),
expected_result=False, expected_result=False,
), ),
# insert-row on table, right table # insert-row on table, right table
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": { "databases": {
"db1": { "perms_ds_one": {
"tables": { "tables": {
"t1": {"permissions": {"insert-row": {"id": "user"}}} "t1": {"permissions": {"insert-row": {"id": "user"}}}
} }
@ -764,14 +770,14 @@ PermMetadataTestCase = collections.namedtuple(
}, },
actor={"id": "user"}, actor={"id": "user"},
action="insert-row", action="insert-row",
resource=("db1", "t1"), resource=("perms_ds_one", "t1"),
expected_result=True, expected_result=True,
), ),
# view-query on canned query, wrong actor # view-query on canned query, wrong actor
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": { "databases": {
"db1": { "perms_ds_one": {
"queries": { "queries": {
"q1": { "q1": {
"sql": "select 1 + 1", "sql": "select 1 + 1",
@ -783,14 +789,14 @@ PermMetadataTestCase = collections.namedtuple(
}, },
actor={"id": "user2"}, actor={"id": "user2"},
action="view-query", action="view-query",
resource=("db1", "q1"), resource=("perms_ds_one", "q1"),
expected_result=False, expected_result=False,
), ),
# view-query on canned query, right actor # view-query on canned query, right actor
PermMetadataTestCase( PermMetadataTestCase(
metadata={ metadata={
"databases": { "databases": {
"db1": { "perms_ds_one": {
"queries": { "queries": {
"q1": { "q1": {
"sql": "select 1 + 1", "sql": "select 1 + 1",
@ -802,7 +808,7 @@ PermMetadataTestCase = collections.namedtuple(
}, },
actor={"id": "user"}, actor={"id": "user"},
action="view-query", action="view-query",
resource=("db1", "q1"), resource=("perms_ds_one", "q1"),
expected_result=True, expected_result=True,
), ),
), ),