Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6fa002d

Browse files
Lorak-mmkdkropachev
authored andcommitted
assert_startswith_diff: Move to utils
I decided to not replace it with simple assert x.startswith(y) because the diff that the function produces is superior to default error message.
1 parent 5fcce2b commit 6fa002d

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

‎tests/integration/standard/test_metadata.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
requires_collection_indexes, SCYLLA_VERSION, xfail_scylla, xfail_scylla_version_lt,
4646
requirescompactstorage)
4747

48-
from tests.util import wait_until, assertRegex, assertDictEqual, assertListEqual
48+
from tests.util import wait_until, assertRegex, assertDictEqual, assertListEqual, assert_startswith_diff
4949

5050
log = logging.getLogger(__name__)
5151

@@ -1125,15 +1125,6 @@ def assert_equal_diff(self, received, expected):
11251125
lineterm=''))
11261126
self.fail(diff_string)
11271127

1128-
def assert_startswith_diff(self, received, prefix):
1129-
if not received.startswith(prefix):
1130-
prefix_lines = prefix.split('\n')
1131-
diff_string = '\n'.join(difflib.unified_diff(prefix_lines,
1132-
received.split('\n')[:len(prefix_lines)],
1133-
'EXPECTED', 'RECEIVED',
1134-
lineterm=''))
1135-
self.fail(diff_string)
1136-
11371128
@greaterthancass20
11381129
def test_export_keyspace_schema_udts(self):
11391130
"""
@@ -1198,15 +1189,15 @@ def test_export_keyspace_schema_udts(self):
11981189
user text PRIMARY KEY,
11991190
addresses map<text, frozen<address>>"""
12001191

1201-
self.assert_startswith_diff(cluster.metadata.keyspaces['export_udts'].export_as_string(), expected_prefix)
1192+
assert_startswith_diff(cluster.metadata.keyspaces['export_udts'].export_as_string(), expected_prefix)
12021193

12031194
table_meta = cluster.metadata.keyspaces['export_udts'].tables['users']
12041195

12051196
expected_prefix = """CREATE TABLE export_udts.users (
12061197
user text PRIMARY KEY,
12071198
addresses map<text, frozen<address>>"""
12081199

1209-
self.assert_startswith_diff(table_meta.export_as_string(), expected_prefix)
1200+
assert_startswith_diff(table_meta.export_as_string(), expected_prefix)
12101201

12111202
cluster.shutdown()
12121203

‎tests/util.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
from functools import wraps
1717
import re
1818
import unittest
19+
import difflib
20+
import pytest
1921

2022

2123
def wait_until(condition, delay, max_attempts):
@@ -97,3 +99,12 @@ def assertCountEqual(a, b):
9799

98100
def assertEqual(a, b):
99101
assert a == b
102+
103+
def assert_startswith_diff(text, prefix):
104+
if not text.startswith(prefix):
105+
prefix_lines = prefix.split('\n')
106+
diff_string = '\n'.join(difflib.unified_diff(prefix_lines,
107+
text.split('\n')[:len(prefix_lines)],
108+
'EXPECTED', 'RECEIVED',
109+
lineterm=''))
110+
pytest.fail(diff_string)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /