Make all test inputs in bytes and decode

apache · Sep 15, 2018 · b0497e2 · b0497e2
1 parent 9bab2df
commit b0497e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/sdks/python/apache_beam/options/pipeline_options_validator_test.py b/sdks/python/apache_beam/options/pipeline_options_validator_test.py
@@ -311,7 +311,7 @@ def get_validator(matcher):
                  '--staging_location=gs://foo/bar',
                  '--temp_location=gs://foo/bar',]
       if matcher:
-        options.append('--on_success_matcher=' + matcher)
+        options.append('%s=%s' % ('--on_success_matcher=', matcher.decode()))
 
       pipeline_options = PipelineOptions(options)
       runner = MockRunners.TestDataflowRunner()
@@ -322,18 +322,14 @@ def get_validator(matcher):
          'errors': []},
         {'on_success_matcher': pickler.dumps(AlwaysPassMatcher()),
          'errors': []},
-        {'on_success_matcher': 'abc',
+        {'on_success_matcher': b'abc',
          'errors': ['on_success_matcher']},
         {'on_success_matcher': pickler.dumps(object),
          'errors': ['on_success_matcher']},
     ]
 
     for case in test_case:
-      matcher = case['on_success_matcher']
-      if matcher and type(matcher) is bytes:
-        errors = get_validator(matcher.decode('utf-8')).validate()
-      else:
-        errors = get_validator(matcher).validate()
+      errors = get_validator(case['on_success_matcher']).validate()
       self.assertEqual(
           self.check_errors_for_arguments(errors, case['errors']), [])
 

diff --git a/sdks/python/apache_beam/testing/test_pipeline.py b/sdks/python/apache_beam/testing/test_pipeline.py
@@ -152,7 +152,7 @@ def get_full_options_as_args(self, **extra_opts):
       elif isinstance(v, bool) and v:
         options.append('--%s' % k)
       elif 'matcher' in k:
-        options.append('--%s=%s' % (k, pickler.dumps(v)))
+        options.append('--%s=%s' % (k, pickler.dumps(v).decode()))
       else:
         options.append('--%s=%s' % (k, v))
     return options