From 1b3076928a38d2a66f03c85db6f168b99723150e4403c0be22b79c615f36e1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sat, 11 Aug 2018 08:05:17 +0000
Subject: [PATCH] - Really run the tests

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testtools?expand=0&rev=57
---
 python-testtools-doc.changes |  5 +++++
 python-testtools-doc.spec    | 27 +++++++++------------------
 python-testtools.changes     |  1 -
 python-testtools.spec        |  2 ++
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/python-testtools-doc.changes b/python-testtools-doc.changes
index 636a5dc..8ab88f3 100644
--- a/python-testtools-doc.changes
+++ b/python-testtools-doc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Aug 11 08:04:56 UTC 2018 - tchvatal@suse.com
+
+- Really run the tests
+
 -------------------------------------------------------------------
 Tue Jul  4 04:07:32 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-testtools-doc.spec b/python-testtools-doc.spec
index 3080103..d6dc505 100644
--- a/python-testtools-doc.spec
+++ b/python-testtools-doc.spec
@@ -23,21 +23,16 @@ Release:        0
 Summary:        Documentation for python-testtools
 License:        MIT
 Group:          Documentation/HTML
-Url:            https://launchpad.net/testtools
-Source:         https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
-BuildRequires:  %{python_module testtools  = %{version}}
-BuildRequires:  python-rpm-macros
-%if %{with tests}
-# Test requirement
-BuildRequires:  %{python_module testscenarios  = %{version}}
-BuildRequires:  %{python_module unittest2 >= 0.8.0}
-%endif
-# Documentation requirements:
+URL:            https://launchpad.net/testtools
+Source:         https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz
+Patch0:         testtools-py37.patch
+BuildRequires:  %{python_module testscenarios}
+BuildRequires:  %{python_module testtools = %{version}}
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildRequires:  python3-Sphinx
 Provides:       python2-testtools-doc = %{version}
 Provides:       python3-testtools-doc = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -45,6 +40,7 @@ Documentation and help files for python-testtools.
 
 %prep
 %setup -q -n testtools-%{version}
+%patch0 -p1
 
 %build
 python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
@@ -54,16 +50,11 @@ mkdir -p %{buildroot}%{_docdir}/python-testtools/
 cp -r build/sphinx/html %{buildroot}%{_docdir}/python-testtools/
 %fdupes %{buildroot}%{_docdir}
 
-# A build cycle exists between python-extras and python-testtools.
-# Doing the tests in a separate package avoids this cycle.
-%if %{with tests}
 %check
-%{python_exec} -m testtools.run testtools.tests.test_suite
-%endif
+%python_exec -m testtools.run testtools.tests.test_suite
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
 %{_docdir}/python-testtools/
 
 %changelog
diff --git a/python-testtools.changes b/python-testtools.changes
index 8d43801..8ba0607 100644
--- a/python-testtools.changes
+++ b/python-testtools.changes
@@ -3,7 +3,6 @@ Fri Aug 10 11:27:08 UTC 2018 - tchvatal@suse.com
 
 - Add patch to build with python 3.7:
   * testtools-py37.patch
-- Remove unittest2 dependency, it is needed only on python2.6
 
 -------------------------------------------------------------------
 Thu Mar  8 10:17:39 UTC 2018 - aplanas@suse.com
diff --git a/python-testtools.spec b/python-testtools.spec
index e7046f1..5a1d6de 100644
--- a/python-testtools.spec
+++ b/python-testtools.spec
@@ -36,6 +36,7 @@ Requires:       python-pbr >= 0.11
 Requires:       python-python-mimeparse
 Requires:       python-six >= 1.4.0
 Requires:       python-traceback2
+Requires:       python-unittest2
 BuildArch:      noarch
 %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24
 Recommends:     python-fixtures >= 1.3.0
@@ -51,6 +52,7 @@ also ports recent unittest changes all the way back to Python 2.4.
 %prep
 %setup -q -n testtools-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %python_build