On Tue 24/09/2019 16:49, Björn Ketelaars wrote:
> Enclosed diff brings git-cola to 3.5, which is a bugfix release. Release
> notes can be found at
> https://github.com/git-cola/git-cola/blob/v3.5/share/doc/git-cola/relnotes.rst
>
> 'make test' fails one test (IconTestCase.test_from_filename_unicode).
> I'm not sure, but it look to me that the test itself is at fault. I have
> opened an issue upstream.
> Run tested OK on amd64.
Upstream fixed the failing unit test. With this fix 'make test' runs
successfully.
New diff enclosed.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:44:09 - 1.30
+++ Makefile25 Sep 2019 11:06:04 -
@@ -2,7 +2,7 @@
COMMENT = python powered git gui
-MODPY_EGG_VERSION= 3.4
+MODPY_EGG_VERSION= 3.5
DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
GH_ACCOUNT = git-cola
Index: distinfo
===
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo18 Jun 2019 04:13:54 - 1.12
+++ distinfo25 Sep 2019 11:06:04 -
@@ -1,2 +1,2 @@
-SHA256 (git-cola-3.4.tar.gz) = dj44LYsyQnU5WF0X7G/pICbAc/bTGoZKWBbr4izyRbw=
-SIZE (git-cola-3.4.tar.gz) = 963393
+SHA256 (git-cola-3.5.tar.gz) = f9z8QyazXjhLl71LshibTLXPJYlINSdZwwLmMrQbsuI=
+SIZE (git-cola-3.5.tar.gz) = 970155
Index: patches/patch-test_icons_test_py
===
RCS file: patches/patch-test_icons_test_py
diff -N patches/patch-test_icons_test_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-test_icons_test_py25 Sep 2019 11:06:04 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix unit test. Taken from https://github.com/git-cola/git-cola/pull/993.
+
+Index: test/icons_test.py
+--- test/icons_test.py.orig
test/icons_test.py
+@@ -11,7 +11,7 @@ from cola import icons
+ class IconTestCase(unittest.TestCase):
+
+ def test_from_filename_unicode(self):
+-filename = compat.uchr(0x400) + '.odt'
++filename = compat.uchr(0x400) + '.py'
+ expect = 'file-code.svg'
+ actual = icons.basename_from_filename(filename)
+ self.assertEqual(expect, actual)
