summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--disable-failing-date-test.patch20
-rw-r--r--python-webhelpers.spec14
2 files changed, 33 insertions, 1 deletions
diff --git a/disable-failing-date-test.patch b/disable-failing-date-test.patch
new file mode 100644
index 0000000..02f448b
--- /dev/null
+++ b/disable-failing-date-test.patch
@@ -0,0 +1,20 @@
+diff -up WebHelpers-1.3/tests/test_date.py.test_date_fixes WebHelpers-1.3/tests/test_date.py
+--- WebHelpers-1.3/tests/test_date.py.test_date_fixes 2011-12-06 18:45:32.075061756 -0500
++++ WebHelpers-1.3/tests/test_date.py 2011-12-06 18:45:40.202061204 -0500
+@@ -13,16 +13,6 @@ class TestDateHelper(WebHelpersTestCase)
+
+ # Test that if integers are supplied they are interpreted as seconds from now
+ self.assertEqual("1 second", distance_of_time_in_words(1))
+- # The following two tests test the span from "now" to "a year from
+- # now". Depending on when the test is run, the interval may include a
+- # leap year. The 'try' assumes it's not a leap year, the 'except'
+- # tries it again as a leap year.
+- try:
+- self.assertEqual("1 year", distance_of_time_in_words(0, 31536000))
+- self.assertEqual("1 year", distance_of_time_in_words(1, 31536001))
+- except AssertionError: # If the intervening year contains February 29th
+- self.assertEqual("11 months and 30 days", distance_of_time_in_words(0, 31536000))
+- self.assertEqual("11 months and 30 days", distance_of_time_in_words(1, 31536001))
+
+ # Granularity is invalid
+ self.assertRaises(Exception, distance_of_time_in_words, 0, 1, 'blah')
diff --git a/python-webhelpers.spec b/python-webhelpers.spec
index 7b3466e..00ca340 100644
--- a/python-webhelpers.spec
+++ b/python-webhelpers.spec
@@ -2,13 +2,21 @@
Name: python-webhelpers
Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Helper library for aiding the writing of web templates in Python
Group: Development/Languages
License: BSD
URL: http://pylonshq.com/WebHelpers/
Source0: http://pypi.python.org/packages/source/W/WebHelpers/WebHelpers-%{version}.tar.gz
+
+# test_distance_of_time_in_words (test_date.TestDateHelper) is not robust
+# w.r.t. timezones and leapyears; patch out the fragile part of the test, for
+# now, to fix the build. Tracked upstream as:
+# https://bitbucket.org/bbangert/webhelpers/issue/61/test_distance_of_time_in_words-fails
+# (rhbz#715831)
+Patch1: disable-failing-date-test.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-setuptools-devel
@@ -28,6 +36,7 @@ to accommodate for Python.
%prep
%setup -q -n WebHelpers-%{version}
+%patch1 -p1
%build
%{__python} setup.py build
@@ -53,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.3-2
+- fix FTBFS by disabling failing date-handling test (rhbz#715831)
+
* Sat May 14 2011 Luke Macken <lmacken@redhat.com> - 1.3-1
- Update to 1.3