From 3a225446aa572d77017ae71593fac96ecbe3506a3f32e0b7521cac5e89b2ee0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 8 Mar 2019 11:22:11 +0000
Subject: [PATCH] Accepting request 682761 from home:jayvdb:py-check-failures

- Add test_modified-fixup.patch to re-enable the test
- Remove build dependency on pytest-runner
- Update to v3.0.8
  * Fix quoting of bytestrings

OBS-URL: https://build.opensuse.org/request/show/682761
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Paste?expand=0&rev=32
---
 Paste-3.0.7.tar.gz        |  3 ---
 Paste-3.0.8.tar.gz        |  3 +++
 python-Paste.changes      |  8 ++++++++
 python-Paste.spec         |  8 +++++---
 test_modified-fixup.patch | 14 ++++++++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)
 delete mode 100644 Paste-3.0.7.tar.gz
 create mode 100644 Paste-3.0.8.tar.gz
 create mode 100644 test_modified-fixup.patch

diff --git a/Paste-3.0.7.tar.gz b/Paste-3.0.7.tar.gz
deleted file mode 100644
index 49d00e5..0000000
--- a/Paste-3.0.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76fa03846e05358ae33d772405cb3a3d9e3a3f80dd5530c406385df31aefdf3a
-size 628999
diff --git a/Paste-3.0.8.tar.gz b/Paste-3.0.8.tar.gz
new file mode 100644
index 0000000..b341c75
--- /dev/null
+++ b/Paste-3.0.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4f13993e6ab4a38602cef298d876552083e8215685bb45abda7113f0dd48117
+size 631298
diff --git a/python-Paste.changes b/python-Paste.changes
index 8b3f153..a2c30a0 100644
--- a/python-Paste.changes
+++ b/python-Paste.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar  8 09:27:42 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
+
+- Add test_modified-fixup.patch to re-enable the test
+- Remove build dependency on pytest-runner
+- Update to v3.0.8
+  * Fix quoting of bytestrings
+
 -------------------------------------------------------------------
 Tue Mar  5 19:12:58 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-Paste.spec b/python-Paste.spec
index 678a82e..c80a173 100644
--- a/python-Paste.spec
+++ b/python-Paste.spec
@@ -19,14 +19,14 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
 Name:           python-Paste
-Version:        3.0.7
+Version:        3.0.8
 Release:        0
 Summary:        Tools for using a Web Server Gateway Interface stack
 License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/cdent/paste
 Source:         https://files.pythonhosted.org/packages/source/P/Paste/Paste-%{version}.tar.gz
-BuildRequires:  %{python_module pytest-runner}
+Patch0:         test_modified-fixup.patch
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six > 1.4.0}
@@ -53,6 +53,8 @@ interfaces.
 
 %prep
 %setup -q -n Paste-%{version}
+%patch0 -p1
+sed -i '/pytest-runner/d' setup.py
 # remove test requiring internet access
 rm tests/test_proxy.py
 
@@ -64,7 +66,7 @@ rm tests/test_proxy.py
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v -k 'not test_modified'
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v
 
 %files %{python_files}
 %license docs/license.txt
diff --git a/test_modified-fixup.patch b/test_modified-fixup.patch
new file mode 100644
index 0000000..70226f6
--- /dev/null
+++ b/test_modified-fixup.patch
@@ -0,0 +1,14 @@
+diff -ru Paste-3.0.8-orig/tests/test_fileapp.py Paste-3.0.8/tests/test_fileapp.py
+--- Paste-3.0.8-orig/tests/test_fileapp.py	2019-02-28 22:09:41.000000000 +0700
++++ Paste-3.0.8/tests/test_fileapp.py	2019-03-08 17:40:52.558943604 +0700
+@@ -96,7 +96,9 @@
+     res = harness.get("/",status=400,
+             headers={'if-modified-since':
+                 'Thu, 22 Dec 3030 01:01:01 GMT'})
+-    assert 400 == res.status and b"check your system clock" in res.body
++    assert 400 == res.status and (
++        b"check your system clock" in res.body or
++        b"ill-formed timestamp" in res.body)
+ 
+ def test_file():
+     tempfile = "test_fileapp.%s.txt" % (random.random())