You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2025/10/15 15:36:16 UTC
(beam) branch users/damccorm/flaky-postcommit created (now 928c9192a1e)
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a change to branch users/damccorm/flaky-postcommit
in repository https://gitbox.apache.org/repos/asf/beam.git
at 928c9192a1e Fix flaky tests caused by secret overlap
This branch includes the following new commits:
new 928c9192a1e Fix flaky tests caused by secret overlap
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(beam) 01/01: Fix flaky tests caused by secret overlap
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch users/damccorm/flaky-postcommit
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 928c9192a1ec017f4c50e3811360193c24e601d2
Author: Danny Mccormick <da...@google.com>
AuthorDate: Wed Oct 15 11:35:49 2025 -0400
Fix flaky tests caused by secret overlap
---
.github/trigger_files/beam_PostCommit_Python.json | 2 +-
sdks/python/apache_beam/transforms/core_it_test.py | 9 +++++----
sdks/python/apache_beam/transforms/util_test.py | 7 ++++---
sdks/python/apache_beam/transforms/validate_runner_xlang_test.py | 9 +++++----
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/.github/trigger_files/beam_PostCommit_Python.json b/.github/trigger_files/beam_PostCommit_Python.json
index 42a6e88b8a2..ed56f65ef50 100644
--- a/.github/trigger_files/beam_PostCommit_Python.json
+++ b/.github/trigger_files/beam_PostCommit_Python.json
@@ -1,5 +1,5 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run.",
- "modification": 31
+ "modification": 32
}
diff --git a/sdks/python/apache_beam/transforms/core_it_test.py b/sdks/python/apache_beam/transforms/core_it_test.py
index 50744e28c67..4e084afe78a 100644
--- a/sdks/python/apache_beam/transforms/core_it_test.py
+++ b/sdks/python/apache_beam/transforms/core_it_test.py
@@ -19,9 +19,9 @@
# pytype: skip-file
-import random
-import string
+import sys
import unittest
+from datetime import datetime
import pytest
@@ -43,8 +43,9 @@ class GbekIT(unittest.TestCase):
def setUp(self):
if secretmanager is not None:
self.project_id = 'apache-beam-testing'
- secret_postfix = ''.join(random.choice(string.digits) for _ in range(6))
- self.secret_id = 'gbek_secret_tests_' + secret_postfix
+ py_version = f'_py{sys.version_info.major}{sys.version_info.minor}'
+ secret_postfix = datetime.now().strftime('%m%d_%H%M%S') + py_version
+ self.secret_id = 'gbekit_secret_tests_' + secret_postfix
self.client = secretmanager.SecretManagerServiceClient()
self.project_path = f'projects/{self.project_id}'
self.secret_path = f'{self.project_path}/secrets/{self.secret_id}'
diff --git a/sdks/python/apache_beam/transforms/util_test.py b/sdks/python/apache_beam/transforms/util_test.py
index 921bd716572..764c790064e 100644
--- a/sdks/python/apache_beam/transforms/util_test.py
+++ b/sdks/python/apache_beam/transforms/util_test.py
@@ -28,7 +28,7 @@ import logging
import math
import random
import re
-import string
+import sys
import time
import unittest
import warnings
@@ -319,8 +319,9 @@ class GroupByEncryptedKeyTest(unittest.TestCase):
def setUp(self):
if secretmanager is not None:
self.project_id = 'apache-beam-testing'
- secret_postfix = ''.join(random.choice(string.digits) for _ in range(6))
- self.secret_id = 'gbek_secret_tests_' + secret_postfix
+ py_version = f'_py{sys.version_info.major}{sys.version_info.minor}'
+ secret_postfix = datetime.now().strftime('%m%d_%H%M%S') + py_version
+ self.secret_id = 'gbek_util_secret_tests_' + secret_postfix
self.client = secretmanager.SecretManagerServiceClient()
self.project_path = f'projects/{self.project_id}'
self.secret_path = f'{self.project_path}/secrets/{self.secret_id}'
diff --git a/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py b/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py
index c68fea65070..f9454797763 100644
--- a/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py
+++ b/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py
@@ -52,10 +52,10 @@ https://docs.google.com/document/d/1xQp0ElIV84b8OCVz8CD2hvbiWdR8w4BvWxPTZJZA6NA
import logging
import os
-import random
-import string
+import sys
import typing
import unittest
+from datetime import datetime
import pytest
@@ -334,8 +334,9 @@ class ValidateRunnerGBEKTest(unittest.TestCase):
def setUp(self):
if secretmanager is not None:
self.project_id = 'apache-beam-testing'
- secret_postfix = ''.join(random.choice(string.digits) for _ in range(6))
- self.secret_id = 'gbek_secret_tests_' + secret_postfix
+ py_version = f'_py{sys.version_info.major}{sys.version_info.minor}'
+ secret_postfix = datetime.now().strftime('%m%d_%H%M%S') + py_version
+ self.secret_id = 'gbek_validaterunner_secret_tests_' + secret_postfix
self.client = secretmanager.SecretManagerServiceClient()
self.project_path = f'projects/{self.project_id}'
self.secret_path = f'{self.project_path}/secrets/{self.secret_id}'