Update patch to always skip unreliable selftest.

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius 2019-09-11 16:02:59 -05:00
commit c781f06f55
2 changed files with 8 additions and 14 deletions

View file

@ -1,20 +1,11 @@
diff -ru ../avocado-69.1.ORIG/selftests/unit/test_loader.py ./selftests/unit/test_loader.py
--- ../avocado-69.1.ORIG/selftests/unit/test_loader.py 2019-06-12 13:39:15.000000000 -0500
+++ ./selftests/unit/test_loader.py 2019-09-09 16:23:21.637693415 -0500
@@ -1,6 +1,7 @@
import os
import shutil
import stat
+import sys
import tempfile
import unittest
@@ -449,6 +450,8 @@
+++ ./selftests/unit/test_loader.py 2019-09-11 15:56:24.289042537 -0500
@@ -449,6 +449,7 @@
('Test10', 'selftests/.data/loader_instrumented/imports.py:Test10.test')]
self._check_discovery(exps, tests)
+ @unittest.skipIf(sys.version_info[0:2] == (3, 8),
+ "Test currently broken on Python 3.8")
+ @unittest.skip("Disabling unreliable test")
def test_dont_detect_non_avocado(self):
path = os.path.join(os.path.dirname(os.path.dirname(__file__)),
'.data', 'loader_instrumented', 'dont_detect_non_avocado.py')

View file

@ -71,7 +71,7 @@
Name: python-%{pkgname}
Version: 69.1
Release: 2%{?gitrel}%{?dist}
Release: 3%{?gitrel}%{?dist}
Summary: Framework with tools and libraries for Automated Testing
Group: Development/Tools
# Found licenses:
@ -81,7 +81,7 @@ Group: Development/Tools
License: GPLv2 and MIT
URL: http://avocado-framework.github.io/
Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar}
Patch0: avocado-69.1-selftest-py3.8.patch
Patch0: avocado-69.1-selftest.patch
BuildArch: noarch
BuildRequires: procps-ng
@ -1172,6 +1172,9 @@ Again Shell code (and possibly other similar shells).
%changelog
* Wed Sep 11 2019 Merlin Mathesius <mmathesi@redhat.com> - 69.1-3
- Update patch to always skip unreliable selftest.
* Mon Sep 09 2019 Merlin Mathesius <mmathesi@redhat.com> - 69.1-2
- Patch to skip selftest currently incompatible with Python 3.8.