revert changes to e2e test file

Author: twishabansal

packages/toolbox-core/tests/test_e2e.py

@@ -41,7 +41,7 @@
 
 
 @pytest.mark.asyncio
-# @pytest.mark.usefixtures("toolbox_server")
+@pytest.mark.usefixtures("toolbox_server")
 class TestE2EClient:
     @pytest_asyncio.fixture(scope="function")
     async def toolbox(self):
@@ -86,7 +86,7 @@ async def test_run_tool(self, get_n_rows_tool: ToolboxTool):
         assert "row3" not in response
 
     async def test_run_tool_missing_params(self, get_n_rows_tool):
-        with pytest.raises(TypeError, match="num_rows * Field required [type=missing, input_value={}, input_type=dict]"):
+        with pytest.raises(TypeError, match="missing a required argument: 'num_rows'"):
             await get_n_rows_tool()
 
     async def test_run_tool_wrong_param_type(self, get_n_rows_tool: ToolboxTool):
@@ -107,75 +107,75 @@ async def test_bind_params(self, toolbox, get_n_rows_tool):
         assert "row3" in response
         assert "row4" not in response
 
-    # ##### Auth tests
-    # async def test_run_tool_unauth_with_auth(self, toolbox, auth_token2):
-    #     """Tests running a tool that doesn't require auth, with auth provided."""
-    #     tool = await toolbox.load_tool(
-    #         "get-row-by-id", auth_token_getters={"my-test-auth": lambda: auth_token2}
-    #     )
-    #     response = await tool(id="2")
-    #     assert "row2" in response
-    #
-    # async def test_run_tool_no_auth(self, toolbox):
-    #     """Tests running a tool requiring auth without providing auth."""
-    #     tool = await toolbox.load_tool(
-    #         "get-row-by-id-auth",
-    #     )
-    #     with pytest.raises(
-    #         Exception,
-    #         match="tool invocation not authorized. Please make sure your specify correct auth headers",
-    #     ):
-    #         await tool(id="2")
-    #
-    # async def test_run_tool_wrong_auth(self, toolbox, auth_token2):
-    #     """Tests running a tool with incorrect auth."""
-    #     tool = await toolbox.load_tool(
-    #         "get-row-by-id-auth",
-    #     )
-    #     auth_tool = tool.add_auth_token_getters({"my-test-auth": lambda: auth_token2})
-    #     with pytest.raises(
-    #         Exception,
-    #         match="tool invocation not authorized",
-    #     ):
-    #         await auth_tool(id="2")
-    #
-    # async def test_run_tool_auth(self, toolbox, auth_token1):
-    #     """Tests running a tool with correct auth."""
-    #     tool = await toolbox.load_tool(
-    #         "get-row-by-id-auth",
-    #     )
-    #     auth_tool = tool.add_auth_token_getters({"my-test-auth": lambda: auth_token1})
-    #     response = await auth_tool(id="2")
-    #     assert "row2" in response
-    #
-    # async def test_run_tool_param_auth_no_auth(self, toolbox):
-    #     """Tests running a tool with a param requiring auth, without auth."""
-    #     tool = await toolbox.load_tool("get-row-by-email-auth")
-    #     with pytest.raises(
-    #         Exception,
-    #         match="One or more of the following authn services are required to invoke this tool: my-test-auth",
-    #     ):
-    #         await tool()
-    #
-    # async def test_run_tool_param_auth(self, toolbox, auth_token1):
-    #     """Tests running a tool with a param requiring auth, with correct auth."""
-    #     tool = await toolbox.load_tool(
-    #         "get-row-by-email-auth",
-    #         auth_token_getters={"my-test-auth": lambda: auth_token1},
-    #     )
-    #     response = await tool()
-    #     assert "row4" in response
-    #     assert "row5" in response
-    #     assert "row6" in response
-    #
-    # async def test_run_tool_param_auth_no_field(self, toolbox, auth_token1):
-    #     """Tests running a tool with a param requiring auth, with insufficient auth."""
-    #     tool = await toolbox.load_tool(
-    #         "get-row-by-content-auth",
-    #         auth_token_getters={"my-test-auth": lambda: auth_token1},
-    #     )
-    #     with pytest.raises(
-    #         Exception,
-    #         match="no field named row_data in claims",
-    #     ):
-    #         await tool()
+    ##### Auth tests
+    async def test_run_tool_unauth_with_auth(self, toolbox, auth_token2):
+        """Tests running a tool that doesn't require auth, with auth provided."""
+        tool = await toolbox.load_tool(
+            "get-row-by-id", auth_token_getters={"my-test-auth": lambda: auth_token2}
+        )
+        response = await tool(id="2")
+        assert "row2" in response
+
+    async def test_run_tool_no_auth(self, toolbox):
+        """Tests running a tool requiring auth without providing auth."""
+        tool = await toolbox.load_tool(
+            "get-row-by-id-auth",
+        )
+        with pytest.raises(
+            Exception,
+            match="tool invocation not authorized. Please make sure your specify correct auth headers",
+        ):
+            await tool(id="2")
+
+    async def test_run_tool_wrong_auth(self, toolbox, auth_token2):
+        """Tests running a tool with incorrect auth."""
+        tool = await toolbox.load_tool(
+            "get-row-by-id-auth",
+        )
+        auth_tool = tool.add_auth_token_getters({"my-test-auth": lambda: auth_token2})
+        with pytest.raises(
+            Exception,
+            match="tool invocation not authorized",
+        ):
+            await auth_tool(id="2")
+
+    async def test_run_tool_auth(self, toolbox, auth_token1):
+        """Tests running a tool with correct auth."""
+        tool = await toolbox.load_tool(
+            "get-row-by-id-auth",
+        )
+        auth_tool = tool.add_auth_token_getters({"my-test-auth": lambda: auth_token1})
+        response = await auth_tool(id="2")
+        assert "row2" in response
+
+    async def test_run_tool_param_auth_no_auth(self, toolbox):
+        """Tests running a tool with a param requiring auth, without auth."""
+        tool = await toolbox.load_tool("get-row-by-email-auth")
+        with pytest.raises(
+            Exception,
+            match="One or more of the following authn services are required to invoke this tool: my-test-auth",
+        ):
+            await tool()
+
+    async def test_run_tool_param_auth(self, toolbox, auth_token1):
+        """Tests running a tool with a param requiring auth, with correct auth."""
+        tool = await toolbox.load_tool(
+            "get-row-by-email-auth",
+            auth_token_getters={"my-test-auth": lambda: auth_token1},
+        )
+        response = await tool()
+        assert "row4" in response
+        assert "row5" in response
+        assert "row6" in response
+
+    async def test_run_tool_param_auth_no_field(self, toolbox, auth_token1):
+        """Tests running a tool with a param requiring auth, with insufficient auth."""
+        tool = await toolbox.load_tool(
+            "get-row-by-content-auth",
+            auth_token_getters={"my-test-auth": lambda: auth_token1},
+        )
+        with pytest.raises(
+            Exception,
+            match="no field named row_data in claims",
+        ):
+            await tool()