Attachment 1102487 Details for Bug 1288688 – 0001-Fix-test-failure-in-December.patch

[patch] 0001-Fix-test-failure-in-December.patch

0001-Fix-test-failure-in-December.patch (text/plain), 3.20 KB, created by Robert Buchholz on 2015-12-05 01:54:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Buchholz

Created: 2015-12-05 01:54:18 UTC

Size: 3.20 KB

patch

obsolete

>From c1609b9818d1d4458f6d7fba8fbbb6814f2952e8 Mon Sep 17 00:00:00 2001
>From: Robert Buchholz <rbu@goodpoint.de>
>Date: Fri, 4 Dec 2015 01:22:07 +0100
>Subject: [PATCH] Fix test failure in December
>
>---
> python-parsedatetime.spec                          |  7 +++-
> ...e-eom-is-correct-but-expectation-is-wrong.patch | 37 ++++++++++++++++++++++
> 2 files changed, 43 insertions(+), 1 deletion(-)
> create mode 100644 test-failure-eom-is-correct-but-expectation-is-wrong.patch
>
>diff --git a/python-parsedatetime.spec b/python-parsedatetime.spec
>index a503fa8..c93d52c 100644
>--- a/python-parsedatetime.spec
>+++ b/python-parsedatetime.spec
>@@ -8,7 +8,7 @@
> 
> Name:           python-%{realname}
> Version:        1.5
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        Parse human-readable date/time strings in Python
> 
> Group:          Development/Languages
>@@ -16,6 +16,7 @@ License:        ASL 2.0
> URL:            https://github.com/bear/%{realname}
> Source0:        https://github.com/bear/%{realname}/archive/v%{version}.tar.gz#/%{realname}-%{version}.tar.gz
> Patch0:         fix-non-executable-script-init.patch
>+Patch1:         test-failure-eom-is-correct-but-expectation-is-wrong.patch
> 
> BuildArch:      noarch
> BuildRequires:  python2-devel
>@@ -49,6 +50,7 @@ strings.
> %prep
> %setup -q -n %{realname}-%{version}
> %patch0 -p1
>+%patch1 -p1
> 
> # Fixes spurious-executable-perm warning
> chmod 644 implementation_notes.txt
>@@ -114,6 +116,9 @@ pushd %{py3dir}
> %endif
> 
> %changelog
>+* Fri Dec 04 2015 Robert Buchholz <rbu@goodpoint.de> - 1.5-3
>+- Fix test failure in December
>+
> * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-2
> - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
> 
>diff --git a/test-failure-eom-is-correct-but-expectation-is-wrong.patch b/test-failure-eom-is-correct-but-expectation-is-wrong.patch
>new file mode 100644
>index 0000000..10b5635
>--- /dev/null
>+++ b/test-failure-eom-is-correct-but-expectation-is-wrong.patch
>@@ -0,0 +1,37 @@
>+From 617f7d9dfc43855df2207dcd43ca25d140bf7b46 Mon Sep 17 00:00:00 2001
>+From: Robert Buchholz <rbu@goodpoint.de>
>+Date: Fri, 4 Dec 2015 01:07:32 +0100
>+Subject: [PATCH] Test failure: eom is correct, but expectation is wrong
>+
>+This test fails in december, because the source time of calculation (s)
>+is in the next year (because it is generated after yr += 1).
>+
>+Upstream PR:
>+https://github.com/bear/parsedatetime/pull/146
>+
>+---
>+ tests/TestStartTimeFromSourceTime.py | 5 ++---
>+ 1 file changed, 2 insertions(+), 3 deletions(-)
>+
>+diff --git a/tests/TestStartTimeFromSourceTime.py b/tests/TestStartTimeFromSourceTime.py
>+index 2401874..3b15c64 100644
>+--- a/tests/TestStartTimeFromSourceTime.py
>++++ b/tests/TestStartTimeFromSourceTime.py
>+@@ -32,13 +32,12 @@ class test(unittest.TestCase):
>+         # to get the end of the current month
>+         (yr, mth, dy, hr, mn, sec, _, _, _) = s.timetuple()
>+ 
>+-        m = mth
>++        s = datetime.datetime(yr, mth, dy, 13, 14, 15)
>++
>+         mth += 1
>+         if mth > 12:
>+             mth = 1
>+             yr += 1
>+-
>+-        s = datetime.datetime(yr, m, dy, 13, 14, 15)
>+         t = datetime.datetime(
>+             yr, mth, 1, 13, 14, 15) + datetime.timedelta(days=-1)
>+ 
>+-- 
>+2.5.0
>-- 
>2.5.0
>

Actions: View | Diff

Attachments on bug 1288688: 1102486 | 1102487