[beam] 01/01: Revert "[BEAM-6522] [BEAM-7455] Unskip Avro IO tests that are now passing. (#10838)"

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvalentyn pushed a commit to branch revert-10838-avro
in repository https://gitbox.apache.org/repos/asf/beam.git

commit dd82f9d9bc1b0b0d03fe1c910a44b52962fb1964
Author: tvalentyn <tv...@users.noreply.github.com>
AuthorDate: Tue Feb 18 11:51:18 2020 -0800

    Revert "[BEAM-6522] [BEAM-7455] Unskip Avro IO tests that are now passing. (#10838)"
    
    This reverts commit 49863a465b368d3a860b1d7c9ee46faa8e6b55e7.
---
 sdks/python/apache_beam/examples/fastavro_it_test.py | 8 +++++++-
 sdks/python/apache_beam/io/avroio_test.py            | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sdks/python/apache_beam/examples/fastavro_it_test.py b/sdks/python/apache_beam/examples/fastavro_it_test.py
index d038d3e..2279ec3 100644
--- a/sdks/python/apache_beam/examples/fastavro_it_test.py
+++ b/sdks/python/apache_beam/examples/fastavro_it_test.py
@@ -49,6 +49,8 @@ from __future__ import division
 
 import json
 import logging
+import os
+import sys
 import unittest
 import uuid
 
@@ -86,6 +88,10 @@ def record(i):
   }
 
 
+@unittest.skipIf(
+    sys.version_info[0] >= 3 and os.environ.get('RUN_SKIPPED_PY3_TESTS') != '1',
+    'Due to a known issue in avro-python3 package, this'
+    'test is skipped until BEAM-6522 is addressed. ')
 class FastavroIT(unittest.TestCase):
 
   SCHEMA_STRING = '''
@@ -175,7 +181,7 @@ class FastavroIT(unittest.TestCase):
           if l != r:
             raise BeamAssertException('Assertion failed: %s == %s' % (l, r))
 
-        assertEqual(sorted(v.keys()), ['avro', 'fastavro'])
+        assertEqual(v.keys(), ['avro', 'fastavro'])
         avro_values = v['avro']
         fastavro_values = v['fastavro']
         assertEqual(avro_values, fastavro_values)
diff --git a/sdks/python/apache_beam/io/avroio_test.py b/sdks/python/apache_beam/io/avroio_test.py
index bfa213c..79036ca 100644
--- a/sdks/python/apache_beam/io/avroio_test.py
+++ b/sdks/python/apache_beam/io/avroio_test.py
@@ -445,6 +445,10 @@ class AvroBase(object):
         assert_that(readback, equal_to([json.dumps(r) for r in self.RECORDS]))
 
 
+@unittest.skipIf(
+    sys.version_info[0] == 3 and os.environ.get('RUN_SKIPPED_PY3_TESTS') != '1',
+    'This test still needs to be fixed on Python 3. '
+    'TODO: BEAM-6522.')
 class TestAvro(AvroBase, unittest.TestCase):
   def __init__(self, methodName='runTest'):
     super(TestAvro, self).__init__(methodName)