Skip to content

Commit 2a0fbd0

Browse files
JCZuurmondJCZuurmond
committed
Update GrantsCrawler unit tests
1 parent cd9384c commit 2a0fbd0

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎tests/unit/hive_metastore/test_grants.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def test_crawler_no_data() -> None:
190190
sql_backend = MockBackend()
191191
table = TablesCrawler(sql_backend, "schema")
192192
udf = UdfsCrawler(sql_backend, "schema")
193-
crawler = GrantsCrawler(sql_backend, inventory_database, table, udf)
193+
crawler = GrantsCrawler(sql_backend, "test", table, udf)
194194
grants = list(crawler.snapshot())
195195
assert len(grants) == 0
196196

@@ -252,7 +252,7 @@ def test_crawler_crawl() -> None:
252252
}
253253
table = TablesCrawler(sql_backend, "schema")
254254
udf = UdfsCrawler(sql_backend, "schema")
255-
crawler = GrantsCrawler(sql_backend, inventory_database, table, udf)
255+
crawler = GrantsCrawler(sql_backend, "test", table, udf)
256256
grants = list(crawler.snapshot())
257257
assert len(grants) == len(expected_grants) and set(grants) == expected_grants
258258

@@ -301,7 +301,7 @@ def test_crawler_udf_crawl() -> None:
301301

302302
table = TablesCrawler(sql_backend, "schema")
303303
udf = UdfsCrawler(sql_backend, "schema")
304-
crawler = GrantsCrawler(sql_backend, inventory_database, table, udf)
304+
crawler = GrantsCrawler(sql_backend, "test", table, udf)
305305
grants = list(crawler.snapshot())
306306

307307
assert len(grants) == len(expected_grants) and set(grants) == expected_grants
@@ -311,7 +311,7 @@ def test_crawler_snapshot_when_no_data() -> None:
311311
sql_backend = MockBackend()
312312
table = TablesCrawler(sql_backend, "schema")
313313
udf = UdfsCrawler(sql_backend, "schema")
314-
crawler = GrantsCrawler(sql_backend, inventory_database, table, udf)
314+
crawler = GrantsCrawler(sql_backend, "test", table, udf)
315315
snapshot = list(crawler.snapshot())
316316
assert len(snapshot) == 0
317317

@@ -320,7 +320,7 @@ def test_crawler_snapshot_with_data() -> None:
320320
sql_backend = MockBackend(rows=ROWS)
321321
table = TablesCrawler(sql_backend, "schema")
322322
udf = UdfsCrawler(sql_backend, "schema")
323-
crawler = GrantsCrawler(sql_backend, inventory_database, table, udf)
323+
crawler = GrantsCrawler(sql_backend, "test", table, udf)
324324
snapshot = list(crawler.snapshot())
325325
assert len(snapshot) == 3
326326

@@ -345,10 +345,10 @@ def test_grants_returning_error_when_showing_grants() -> None:
345345
],
346346
}
347347

348-
backend = MockBackend(fails_on_first=errors, rows=rows)
349-
table_crawler = TablesCrawler(backend, "default")
350-
udf = UdfsCrawler(backend, "default")
351-
crawler = GrantsCrawler(sql_backend, inventory_database, table_crawler, udf)
348+
sql_backend = MockBackend(fails_on_first=errors, rows=rows)
349+
table_crawler = TablesCrawler(sql_backend, "default")
350+
udf = UdfsCrawler(sql_backend, "default")
351+
crawler = GrantsCrawler(sql_backend, "test", table_crawler, udf)
352352

353353
results = list(crawler.snapshot())
354354
assert results == [
@@ -381,10 +381,10 @@ def test_grants_returning_error_when_describing() -> None:
381381
],
382382
}
383383

384-
backend = MockBackend(fails_on_first=errors, rows=rows)
385-
table_crawler = TablesCrawler(backend, "default")
386-
udf = UdfsCrawler(backend, "default")
387-
crawler = GrantsCrawler(sql_backend, inventory_database, table_crawler, udf)
384+
sql_backend = MockBackend(fails_on_first=errors, rows=rows)
385+
table_crawler = TablesCrawler(sql_backend, "default")
386+
udf = UdfsCrawler(sql_backend, "default")
387+
crawler = GrantsCrawler(sql_backend, "test", table_crawler, udf)
388388

389389
results = list(crawler.snapshot())
390390
assert results == [
@@ -420,10 +420,10 @@ def test_udf_grants_returning_error_when_showing_grants() -> None:
420420
],
421421
}
422422

423-
backend = MockBackend(fails_on_first=errors, rows=rows)
424-
table_crawler = TablesCrawler(backend, "default")
425-
udf = UdfsCrawler(backend, "default")
426-
crawler = GrantsCrawler(sql_backend, inventory_database, table_crawler, udf)
423+
sql_backend = MockBackend(fails_on_first=errors, rows=rows)
424+
table_crawler = TablesCrawler(sql_backend, "default")
425+
udf = UdfsCrawler(sql_backend, "default")
426+
crawler = GrantsCrawler(sql_backend, "test", table_crawler, udf)
427427

428428
results = list(crawler.snapshot())
429429
assert results == [
@@ -456,10 +456,10 @@ def test_udf_grants_returning_error_when_describing() -> None:
456456
],
457457
}
458458

459-
backend = MockBackend(fails_on_first=errors, rows=rows)
460-
table_crawler = TablesCrawler(backend, "default")
461-
udf = UdfsCrawler(backend, "default")
462-
crawler = GrantsCrawler(sql_backend, inventory_database, table_crawler, udf)
459+
sql_backend = MockBackend(fails_on_first=errors, rows=rows)
460+
table_crawler = TablesCrawler(sql_backend, "default")
461+
udf = UdfsCrawler(sql_backend, "default")
462+
crawler = GrantsCrawler(sql_backend, "test", table_crawler, udf)
463463

464464
results = list(crawler.snapshot())
465465
assert results == [
@@ -504,7 +504,7 @@ def test_crawler_should_filter_databases() -> None:
504504

505505
table = TablesCrawler(sql_backend, "schema", include_databases=["database_one"])
506506
udf = UdfsCrawler(sql_backend, "schema", include_databases=["database_one"])
507-
crawler = GrantsCrawler(sql_backend, inventory_database, table, udf, include_databases=["database_one"])
507+
crawler = GrantsCrawler(sql_backend, "test", table, udf, include_databases=["database_one"])
508508
grants = list(crawler.snapshot())
509509

510510
assert "SHOW DATABASES" not in sql_backend.queries

‎tests/unit/workspace_access/test_tacl.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_tacl_crawler() -> None:
3232
)
3333
tables_crawler = TablesCrawler(sql_backend, "test")
3434
udf_crawler = UdfsCrawler(sql_backend, "test")
35-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
35+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
3636
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
3737

3838
crawler_tasks = table_acl_support.get_crawler_tasks()
@@ -54,7 +54,7 @@ def test_tacl_udf_crawler() -> None:
5454
)
5555
tables_crawler = TablesCrawler(sql_backend, "test")
5656
udf_crawler = UdfsCrawler(sql_backend, "test")
57-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
57+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
5858
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
5959

6060
crawler_tasks = table_acl_support.get_crawler_tasks()
@@ -95,7 +95,7 @@ def test_tacl_crawler_multiple_permissions() -> None:
9595
}
9696
)
9797
grants_crawler = GrantsCrawler(
98-
sql_backend, inventory_database, TablesCrawler(sql_backend, "test"), UdfsCrawler(sql_backend, "test")
98+
sql_backend, "test", TablesCrawler(sql_backend, "test"), UdfsCrawler(sql_backend, "test")
9999
)
100100
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
101101

@@ -268,7 +268,7 @@ def test_tacl_applier() -> None:
268268
)
269269
tables_crawler = TablesCrawler(sql_backend, "test")
270270
udf_crawler = UdfsCrawler(sql_backend, "test")
271-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
271+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
272272
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
273273

274274
permissions = Permissions(
@@ -311,7 +311,7 @@ def test_tacl_applier_not_applied() -> None:
311311
sql_backend = MockBackend(rows={"SELECT \\* FROM `hive_metastore`.`test`.`grants`": []})
312312
tables_crawler = TablesCrawler(sql_backend, "test")
313313
udf_crawler = UdfsCrawler(sql_backend, "test")
314-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
314+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
315315
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
316316

317317
permissions = Permissions(
@@ -363,7 +363,7 @@ def test_tacl_udf_applier() -> None:
363363
)
364364
tables_crawler = TablesCrawler(sql_backend, "test")
365365
udf_crawler = UdfsCrawler(sql_backend, "test")
366-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
366+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
367367
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
368368

369369
permissions = Permissions(
@@ -416,7 +416,7 @@ def test_tacl_applier_multiple_actions() -> None:
416416
)
417417
tables_crawler = TablesCrawler(sql_backend, "test")
418418
udf_crawler = UdfsCrawler(sql_backend, "test")
419-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
419+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
420420
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
421421

422422
permissions = Permissions(
@@ -470,7 +470,7 @@ def test_tacl_applier_deny_and_grant() -> None:
470470
)
471471
tables_crawler = TablesCrawler(sql_backend, "test")
472472
udf_crawler = UdfsCrawler(sql_backend, "test")
473-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
473+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
474474
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
475475

476476
permissions = Permissions(
@@ -556,7 +556,7 @@ def test_verify_task_should_return_true_if_permissions_applied() -> None:
556556
)
557557
tables_crawler = TablesCrawler(sql_backend, "test")
558558
udf_crawler = UdfsCrawler(sql_backend, "test")
559-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
559+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
560560
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
561561

562562
item = Permissions(
@@ -588,7 +588,7 @@ def test_verify_task_should_fail_if_permissions_not_applied() -> None:
588588
)
589589
tables_crawler = TablesCrawler(sql_backend, "test")
590590
udf_crawler = UdfsCrawler(sql_backend, "test")
591-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
591+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
592592
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
593593

594594
item = Permissions(
@@ -614,7 +614,7 @@ def test_verify_task_should_return_false_if_not_grants_present() -> None:
614614
sql_backend = MockBackend()
615615
tables_crawler = TablesCrawler(sql_backend, "test")
616616
udf_crawler = UdfsCrawler(sql_backend, "test")
617-
grants_crawler = GrantsCrawler(sql_backend, inventory_database, tables_crawler, udf_crawler)
617+
grants_crawler = GrantsCrawler(sql_backend, "test", tables_crawler, udf_crawler)
618618
table_acl_support = TableAclSupport(grants_crawler, sql_backend)
619619

620620
item = Permissions(

0 commit comments

Comments
 (0)