Skip to content

[BEAM-10474] Relax matchers to match display data from the specific tests, not from all options. #12288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaltay merged 1 commit into from
Jul 17, 2020
Merged

[BEAM-10474] Relax matchers to match display data from the specific tests, not from all options. #12288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions sdks/python/apache_beam/transforms/display_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ def _add_argparse_args(cls, parser):
'RuntimeValueProvider(option: float_flag,'
' type: float, default_value: None)')
]
hc.assert_that(items, hc.contains_inanyorder(*expected_items))
hc.assert_that(items, hc.has_items(*expected_items))

def test_create_list_display_data(self):
flags = ['--extra_package', 'package1', '--extra_package', 'package2']
pipeline_options = PipelineOptions(flags=flags)
items = DisplayData.create_from_options(pipeline_options).items
hc.assert_that(
items,
hc.contains_inanyorder(
hc.has_items(
DisplayDataItemMatcher(
'extra_packages', str(['package1', 'package2']))))

Expand Down Expand Up @@ -219,7 +219,7 @@ def display_data(self):
key='static_string', value='static me!', namespace=nspace)
]

hc.assert_that(dd.items, hc.contains_inanyorder(*expected_items))
hc.assert_that(dd.items, hc.has_items(*expected_items))

def test_drop_if_none(self):
class MyDoFn(beam.DoFn):
Expand All @@ -236,7 +236,7 @@ def display_data(self):
DisplayDataItemMatcher('some_val', 'something'),
DisplayDataItemMatcher('nodef_val', True)
]
hc.assert_that(dd.items, hc.contains_inanyorder(*expected_items))
hc.assert_that(dd.items, hc.has_items(*expected_items))

def test_subcomponent(self):
class SpecialDoFn(beam.DoFn):
Expand All @@ -253,7 +253,7 @@ def display_data(self):
DisplayDataItemMatcher('fn', SpecialDoFn, pardo_nspace)
]

hc.assert_that(dd.items, hc.contains_inanyorder(*expected_items))
hc.assert_that(dd.items, hc.has_items(*expected_items))


# TODO: Test __repr__ function
Expand Down