[python-peewee/el6] Added a patch for those 3 failures

Matej Stuchlik mstuchli at fedoraproject.org
Mon Sep 30 08:43:52 UTC 2013


commit b85f23e503ffdbc6c403359edd83e53b51bfc16b
Author: Matej Stuchlik <mstuchli at redhat.com>
Date:   Mon Sep 30 10:26:09 2013 +0200

    Added a patch for those 3 failures

 python-peewee.spec |   10 +++++++---
 tests.patch        |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/python-peewee.spec b/python-peewee.spec
index fb86784..a9a816b 100644
--- a/python-peewee.spec
+++ b/python-peewee.spec
@@ -2,7 +2,7 @@
 
 Name:		python-%{pypi_name}
 Version:	2.1.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A small, expressive orm
 
 License:	MIT
@@ -10,6 +10,7 @@ URL:		http://github.com/coleifer/peewee/
 Source0:	https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
 Patch0: concurency-test.patch
+Patch1: tests.patch
 
 BuildArch:	noarch
 BuildRequires:	python2-devel python-setuptools
@@ -23,6 +24,7 @@ flask-peewee.
 %prep
 %setup -q -n %{pypi_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -33,8 +35,7 @@ rm %{buildroot}%{python_sitelib}/pwiz.*
 mv %{buildroot}%{_bindir}/{pwiz.py,pwiz} 
 
 %check
-# 3 expected failures due to Python 2 version in el6
-%{__python} setup.py test 2>&1 | grep "FAILED (errors=3)"
+%{__python} setup.py test
 
 %files
 %doc LICENSE README.rst
@@ -44,6 +45,9 @@ mv %{buildroot}%{_bindir}/{pwiz.py,pwiz}
 %{_bindir}/*
 
 %changelog
+* Mon Sep 30 2013 Matej Stuchlik <mstuchli at redhat.com> - 2.1.4-4
+- Added a patch for those 3 failures
+
 * Mon Sep 16 2013 Matej Stuchlik <mstuchli at redhat.com> - 2.1.4-3
 - Skip 3 tests failing due to Python 2 version in el6
 
diff --git a/tests.patch b/tests.patch
new file mode 100644
index 0000000..00c45e9
--- /dev/null
+++ b/tests.patch
@@ -0,0 +1,23 @@
+diff -up peewee-2.1.4/tests.py.orig peewee-2.1.4/tests.py
+--- peewee-2.1.4/tests.py.orig	2013-09-27 09:08:58.003997544 +0200
++++ peewee-2.1.4/tests.py	2013-09-27 09:08:37.865863918 +0200
+@@ -314,6 +314,7 @@ MODELS = [
+ INT = test_db.interpolation
+ 
+ def drop_tables(only=None):
++    test_db.get_tables()
+     for model in reversed(MODELS):
+         if only is None or model in only:
+             model.drop_table(True)
+@@ -2469,8 +2470,9 @@ class PrimaryForeignKeyTestCase(ModelTes
+         self.assertEqual([job], list(executed_jobs))
+ 
+         # we must not be able to create another execution record for the job
+-        with self.assertRaises(Exception):
+-            JobExecutionRecord.create(job=job, status='success')
++        self.assertRaises(Exception, JobExecutionRecord.create,
++                                     job=job,
++                                     status='success')
+         test_db.rollback()
+ 
+ 


More information about the scm-commits mailing list