Fix tests failure because of behavior change of server side error message and error code (#1982)

Author: sfc-gh-yuwang

test/integ/test_connection.py

@@ -33,7 +33,7 @@
     ER_NO_ACCOUNT_NAME,
     ER_NOT_IMPLICITY_SNOWFLAKE_DATATYPE,
 )
-from snowflake.connector.errors import Error, ForbiddenError
+from snowflake.connector.errors import Error
 from snowflake.connector.network import APPLICATION_SNOWSQL, ReauthenticationRequest
 from snowflake.connector.sqlstate import SQLSTATE_FEATURE_NOT_SUPPORTED
 from snowflake.connector.telemetry import TelemetryField
@@ -491,8 +491,9 @@ def exe(sql):
 
 
 @pytest.mark.timeout(15)
+@pytest.mark.skipolddriver
 def test_invalid_account_timeout():
-    with pytest.raises(ForbiddenError):
+    with pytest.raises(OperationalError):
         snowflake.connector.connect(
             account="bogus", user="test", password="test", login_timeout=5
         )
@@ -518,6 +519,7 @@ def test_invalid_proxy(db_parameters):
 
 
 @pytest.mark.timeout(15)
+@pytest.mark.skipolddriver
 def test_eu_connection(tmpdir):
     """Tests setting custom region.
 
@@ -530,7 +532,7 @@ def test_eu_connection(tmpdir):
     import os
 
     os.environ["SF_OCSP_RESPONSE_CACHE_SERVER_ENABLED"] = "true"
-    with pytest.raises(ForbiddenError):
+    with pytest.raises(OperationalError):
         # must reach Snowflake
         snowflake.connector.connect(
             account="testaccount1234",
@@ -544,6 +546,7 @@ def test_eu_connection(tmpdir):
         )
 
 
+@pytest.mark.skipolddriver
 def test_us_west_connection(tmpdir):
     """Tests default region setting.
 
@@ -553,7 +556,7 @@ def test_us_west_connection(tmpdir):
     Notes:
         Region is deprecated.
     """
-    with pytest.raises(ForbiddenError):
+    with pytest.raises(OperationalError):
         # must reach Snowflake
         snowflake.connector.connect(
             account="testaccount1234",

test/unit/test_connection.py

@@ -22,12 +22,7 @@
 
 import snowflake.connector
 from snowflake.connector.connection import DEFAULT_CONFIGURATION
-from snowflake.connector.errors import (
-    Error,
-    ForbiddenError,
-    OperationalError,
-    ProgrammingError,
-)
+from snowflake.connector.errors import Error, OperationalError, ProgrammingError
 
 from ..randomize import random_string
 from .mock_utils import mock_request_with_action, zero_backoff
@@ -344,7 +339,7 @@ def test_invalid_backoff_policy():
         # passing a non-generator function should not work
         _ = fake_connector(backoff_policy=lambda: None)
 
-    with pytest.raises(ForbiddenError):
+    with pytest.raises(OperationalError):
         # passing a generator function should make it pass config and error during connection
         _ = fake_connector(backoff_policy=zero_backoff)