Update test_model_grants.py

dremio · Jan 21, 2025 · 389e04a · 389e04a
1 parent 0551fdc
commit 389e04a
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/tests/functional/adapter/grants/test_model_grants.py b/tests/functional/adapter/grants/test_model_grants.py
@@ -43,7 +43,7 @@
         select: ["{{ env_var('DBT_TEST_USER_1') }}"]
 """
 
-class TestViewGrantsDremio(BaseGrantsDremio):
+class TestViewGrantsDremio(BaseGrantsDremio, BaseModelGrants):
     @pytest.fixture(scope="class")
     def models(self):
         updated_schema = self.interpolate_name_overrides(model_schema_yml)
@@ -80,7 +80,14 @@ def test_view_table_grants(self, project, get_test_users):
         self.assert_expected_grants_match_actual(project, "my_model", expected)
 
 
-class TestTableGrantsDremio(BaseGrantsDremio):
+class TestTableGrantsDremio(BaseGrantsDremio, BaseModelGrants):
+    @pytest.fixture(scope="class")
+    def models(self):
+        updated_schema = self.interpolate_name_overrides(model_schema_yml)
+        return {
+            "my_model.sql": my_model_sql,
+            "schema.yml": updated_schema,
+        }
     # Need to override this to make sure it uses our modified version of relation_from_name
     # This isn't needed for views, as dbt-core's version defaults to database/schema path
     def get_grants_on_relation(self, project, relation_name):
@@ -108,7 +115,7 @@ def test_view_table_grants(self, project, get_test_users):
         model_id = "model.test.my_model"
         model = manifest.nodes[model_id]
         assert model.config.materialized == "table"
-        expected = {select_privilege_name: [test_users[0]]}
+        expected = {select_privilege_name: ["user:" + test_users[0]]}
         self.assert_expected_grants_match_actual(project, "my_model", expected)
 
         # Table materialization, change select grant user
@@ -119,7 +126,7 @@ def test_view_table_grants(self, project, get_test_users):
         manifest = get_manifest(project.project_root)
         model = manifest.nodes[model_id]
         assert model.config.materialized == "table"
-        expected = {select_privilege_name: [test_users[1]]}
+        expected = {select_privilege_name: ["user:" + test_users[1]]}
         self.assert_expected_grants_match_actual(project, "my_model", expected)
 
         # Table materialization, multiple grantees
@@ -132,7 +139,7 @@ def test_view_table_grants(self, project, get_test_users):
         manifest = get_manifest(project.project_root)
         model = manifest.nodes[model_id]
         assert model.config.materialized == "table"
-        expected = {select_privilege_name: [test_users[0], test_users[1]]}
+        expected = {select_privilege_name: ["user:" + test_users[0], "user:" + test_users[1]]}
         self.assert_expected_grants_match_actual(project, "my_model", expected)
 
         # Table materialization, multiple privileges
@@ -146,7 +153,7 @@ def test_view_table_grants(self, project, get_test_users):
         model = manifest.nodes[model_id]
         assert model.config.materialized == "table"
         expected = {
-            select_privilege_name: [test_users[0]],
-            insert_privilege_name: [test_users[1]],
+            select_privilege_name: ["user:" + test_users[0]],
+            insert_privilege_name: ["user:" + test_users[1]],
         }
         self.assert_expected_grants_match_actual(project, "my_model", expected)