Skip to content
This repository was archived by the owner on Jun 8, 2026. It is now read-only.

fix: Convert PBs in system test cleanup #199

Merged
c24t merged 9 commits into from
Dec 22, 2020
Merged

fix: Convert PBs in system test cleanup #199

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b726a9
fix: Convert PBs in system test cleanup
c24t Dec 21, 2020
e187912
Blacken
c24t Dec 22, 2020
1c6da4b
Update DBAPI system test too
c24t Dec 22, 2020
45087bc
fix: Rename to fix "Mismatched region tag" check
c24t Dec 22, 2020
c0923e1
CI check: log span test errors
c24t Dec 22, 2020
4e135de
CI check: don't raise
c24t Dec 22, 2020
ea3d736
Revert "CI check: don't raise"
c24t Dec 22, 2020
ea43ca1
Revert "CI check: log span test errors"
c24t Dec 22, 2020
cb5f29a
Merge branch 'lowercase-test' into 195-cleanup-fix
c24t Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "CI check: don't raise" 
This reverts commit 4e135de.
  • Loading branch information
@c24t
c24t committed Dec 22, 2020
commit ea3d736799723be34c0ceae6cc62bbb5c001ad39
17 changes: 17 additions & 0 deletions tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,7 @@ def test_batch_insert_then_read(self):
self.assertEqual(len(span_list), 4)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.GetSession",
Expand All @@ -928,6 +929,7 @@ def test_batch_insert_then_read(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.Commit",
Expand All @@ -939,6 +941,7 @@ def test_batch_insert_then_read(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.GetSession",
Expand All @@ -950,6 +953,7 @@ def test_batch_insert_then_read(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.ReadOnlyTransaction",
Expand All @@ -965,6 +969,7 @@ def test_batch_insert_then_read(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise

def test_batch_insert_then_read_string_array_of_string(self):
TABLE = "string_plus_array_of_string"
Expand Down Expand Up @@ -1076,6 +1081,7 @@ def test_transaction_read_and_insert_then_rollback(self):
self.assertEqual(len(span_list), 8)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.CreateSession",
Expand All @@ -1084,6 +1090,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.GetSession",
Expand All @@ -1095,6 +1102,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.Commit",
Expand All @@ -1106,6 +1114,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.BeginTransaction",
Expand All @@ -1114,6 +1123,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.ReadOnlyTransaction",
Expand All @@ -1129,6 +1139,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.ReadOnlyTransaction",
Expand All @@ -1144,6 +1155,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.Rollback",
Expand All @@ -1152,6 +1164,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertSpanAttributes(
"CloudSpanner.ReadOnlyTransaction",
Expand All @@ -1167,6 +1180,7 @@ def test_transaction_read_and_insert_then_rollback(self):
)
except AssertionError:
logger.error(pformat(span_list))
raise

def _transaction_read_then_raise(self, transaction):
rows = list(transaction.read(self.TABLE, self.COLUMNS, self.ALL))
Expand Down Expand Up @@ -1518,6 +1532,7 @@ def unit_of_work(transaction, self):
self.assertEqual(len(span_list), 6)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
self.assertEqual(
list(map(lambda span: span.name, span_list)),
Expand All @@ -1532,12 +1547,14 @@ def unit_of_work(transaction, self):
)
except AssertionError:
logger.error(pformat(span_list))
raise
try:
for span in span_list[2:-1]:
self.assertEqual(span.context.trace_id, span_list[-1].context.trace_id)
self.assertEqual(span.parent.span_id, span_list[-1].context.span_id)
except AssertionError:
logger.error(pformat(span_list))
raise

def test_execute_partitioned_dml(self):
# [START spanner_test_dml_partioned_dml_update]
Expand Down