t push origin masterMerge branch 'clebergnu-epel_7_rpm_build_release_57_0_release_1_upstream'

python-avocado.spec

@@ -29,7 +29,7 @@
 Summary: Framework with tools and libraries for Automated Testing
 Name: python-%{srcname}
 Version: 57.0
-Release: 0%{?gitrel}%{?dist}
+Release: 2%{?gitrel}%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://avocado-framework.github.io/
@@ -440,6 +440,12 @@ examples of how to write tests on your own.
 %{_datadir}/avocado/varianter_pict
 
 %changelog
+* Tue Dec 19 2017 Cleber Rosa <cleber@redhat.com> - 57.0-2
+- Removed patch added on release 1, considering it's upstream
+
+* Tue Dec 19 2017 Cleber Rosa <cleber@redhat.com> - 57.0-1
+- Add patch to skip tests on EPEL 7 due to mock version
+
 * Tue Dec 19 2017 Cleber Rosa <cleber@redhat.com> - 57.0-0
 - New upstream release
 

selftests/unit/test_utils_cpu.py

@@ -10,6 +10,11 @@ except ImportError:
 from avocado.utils import cpu
 
 
+def recent_mock():
+    major = int(mock.__version__.split('.')[0])
+    return major >= 2
+
+
 class Cpu(unittest.TestCase):
 
     @staticmethod
@@ -19,6 +24,8 @@ class Cpu(unittest.TestCase):
         file_mock.__exit__ = mock.Mock()
         return file_mock
 
+    @unittest.skipUnless(recent_mock(),
+                         "mock library version cannot (easily) patch open()")
     def test_s390x(self):
         s390x = u"""vendor_id       : IBM/S390
 # processors    : 2
@@ -87,6 +94,8 @@ cpu MHz static  : 5504
                             return_value=self._get_file_mock(s390x_2)):
                 self.assertEqual(len(cpu.cpu_online_list()), 4)
 
+    @unittest.skipUnless(recent_mock(),
+                         "mock library version cannot (easily) patch open()")
     def test_x86_64(self):
         x86_64 = u"""processor	: 0
 vendor_id	: GenuineIntel