Skip to content

Commit

Permalink
testing: fix / skip systests broken by dependency releases (#227)
Browse files Browse the repository at this point in the history
See #226.  This PR doesn't *fix* the issue, because the KMS breakage
still exists:  it just skips the KMS systests under Python3, until we have
dropped support for Python2.
  • Loading branch information
tseaver committed Aug 5, 2020
1 parent e089b28 commit 9895bdf
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions tests/system/test_system.py
Expand Up @@ -34,6 +34,7 @@
from google.cloud.storage.bucket import LifecycleRuleSetStorageClass
from google.cloud import kms
import google.api_core
from google.api_core import path_template
import google.oauth2
from test_utils.retry import RetryErrors
from test_utils.system import unique_resource_id
Expand Down Expand Up @@ -1280,7 +1281,7 @@ def test_create_signed_read_url_v4_w_csek(self):
def test_create_signed_read_url_v2_w_access_token(self):
client = iam_credentials_v1.IAMCredentialsClient()
service_account_email = Config.CLIENT._credentials.service_account_email
name = google.api_core.path_template.expand(
name = path_template.expand(
"projects/{project}/serviceAccounts/{service_account}",
project="-",
service_account=service_account_email,
Expand All @@ -1298,7 +1299,7 @@ def test_create_signed_read_url_v2_w_access_token(self):
def test_create_signed_read_url_v4_w_access_token(self):
client = iam_credentials_v1.IAMCredentialsClient()
service_account_email = Config.CLIENT._credentials.service_account_email
name = google.api_core.path_template.expand(
name = path_template.expand(
"projects/{project}/serviceAccounts/{service_account}",
project="-",
service_account=service_account_email,
Expand Down Expand Up @@ -1828,6 +1829,14 @@ def test_access_to_public_bucket(self):
retry_429_503(blob.download_to_file)(stream)


_KMS_2_0_BREAKAGE_MESSAGE = """\
KMS 2.0.0 incompatible with our test setup.
See https://github.com/googleapis/python-storage/issues/226
"""


@unittest.skipIf(six.PY3, reason=_KMS_2_0_BREAKAGE_MESSAGE)
class TestKMSIntegration(TestStorageFiles):

FILENAMES = ("file01.txt",)
Expand Down

0 comments on commit 9895bdf

Please sign in to comment.