Skip to content

Commit 8b713c3

Browse files
committed
update replacement in owlbot.py
1 parent b399a62 commit 8b713c3

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

noxfile.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,17 @@ def install_systemtest_dependencies(session, *constraints):
294294

295295

296296
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
297-
@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
297+
@nox.parametrize(
298+
"protobuf_implementation,database_dialect",
299+
[
300+
("python", "GOOGLE_STANDARD_SQL"),
301+
("python", "POSTGRESQL"),
302+
("upb", "GOOGLE_STANDARD_SQL"),
303+
("upb", "POSTGRESQL"),
304+
("cpp", "GOOGLE_STANDARD_SQL"),
305+
("cpp", "POSTGRESQL"),
306+
],
307+
)
298308
def system(session, database_dialect):
299309
"""Run the system test suite."""
300310
constraints_path = str(
@@ -338,6 +348,7 @@ def system(session, database_dialect):
338348
system_test_path,
339349
*session.posargs,
340350
env={
351+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
341352
"SPANNER_DATABASE_DIALECT": database_dialect,
342353
"SKIP_BACKUP_TESTS": "true",
343354
},
@@ -350,6 +361,7 @@ def system(session, database_dialect):
350361
system_test_folder_path,
351362
*session.posargs,
352363
env={
364+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
353365
"SPANNER_DATABASE_DIALECT": database_dialect,
354366
"SKIP_BACKUP_TESTS": "true",
355367
},

owlbot.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,17 @@ def place_before(path, text, *before_text, escape=None):
238238
"""@nox.session\(python=SYSTEM_TEST_PYTHON_VERSIONS\)
239239
def system\(session\):""",
240240
"""@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
241-
@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
241+
@nox.parametrize(
242+
"protobuf_implementation,database_dialect",
243+
[
244+
("python", "GOOGLE_STANDARD_SQL"),
245+
("python", "POSTGRESQL"),
246+
("upb", "GOOGLE_STANDARD_SQL"),
247+
("upb", "POSTGRESQL"),
248+
("cpp", "GOOGLE_STANDARD_SQL"),
249+
("cpp", "POSTGRESQL"),
250+
],
251+
)
242252
def system(session, database_dialect):""",
243253
)
244254

@@ -248,6 +258,7 @@ def system(session, database_dialect):""",
248258
\)""",
249259
"""*session.posargs,
250260
env={
261+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
251262
"SPANNER_DATABASE_DIALECT": database_dialect,
252263
"SKIP_BACKUP_TESTS": "true",
253264
},

0 commit comments

Comments
 (0)