summaryrefslogtreecommitdiff
path: root/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch')
-rw-r--r--dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch b/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch
new file mode 100644
index 000000000000..2210b2b6eddd
--- /dev/null
+++ b/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/447482
+
+------------------------------------------------------------------------
+r41 | jwilliams@endpoint.com | 2012-02-21 17:17:32 -0500 (Tue, 21 Feb 2012) | 5 lines
+
+Unit test updates for Python 2.7 compatibility
+
+* Add "msg" parameter to our versions of the test functions
+* Change regex to match the updated 2.7 float() ValueError response
+
+
+Index: tests/gflags_googletest.py
+===================================================================
+--- tests/gflags_googletest.py (revision 40)
++++ tests/gflags_googletest.py (revision 41)
+@@ -88,22 +88,22 @@ def MultiLineEqual(expected, actual):
+
+
+ class TestCase(unittest.TestCase):
+- def assertListEqual(self, list1, list2):
++ def assertListEqual(self, list1, list2, msg=None):
+ """Asserts that, when sorted, list1 and list2 are identical."""
+ # This exists in python 2.7, but not previous versions. Use the
+ # built-in version if possible.
+ if hasattr(unittest.TestCase, "assertListEqual"):
+- unittest.TestCase.assertListEqual(self, Sorted(list1), Sorted(list2))
++ unittest.TestCase.assertListEqual(self, Sorted(list1), Sorted(list2), msg)
+ else:
+- self.assertEqual(Sorted(list1), Sorted(list2))
++ self.assertEqual(Sorted(list1), Sorted(list2), msg)
+
+- def assertMultiLineEqual(self, expected, actual):
++ def assertMultiLineEqual(self, expected, actual, msg=None):
+ # This exists in python 2.7, but not previous versions. Use the
+ # built-in version if possible.
+ if hasattr(unittest.TestCase, "assertMultiLineEqual"):
+- unittest.TestCase.assertMultiLineEqual(self, expected, actual)
++ unittest.TestCase.assertMultiLineEqual(self, expected, actual, msg)
+ else:
+- self.assertTrue(MultiLineEqual(expected, actual))
++ self.assertTrue(MultiLineEqual(expected, actual), msg)
+
+ def assertRaisesWithRegexpMatch(self, exception, regexp, fn, *args, **kwargs):
+ try:
+Index: tests/gflags_unittest.py
+===================================================================
+--- tests/gflags_unittest.py (revision 40)
++++ tests/gflags_unittest.py (revision 41)
+@@ -814,7 +814,7 @@ class MultiNumericalFlagsTest(googletest
+
+ self.assertRaisesWithRegexpMatch(
+ gflags.IllegalFlagValue,
+- 'flag --m_float2=abc: invalid literal for float\(\): abc',
++ 'flag --m_float2=abc: (invalid literal for float\(\)||could not convert string to float): abc',
+ gflags.DEFINE_multi_float, 'm_float2', ['abc'], 'desc')
+
+ # Test non-parseable command line values.
+@@ -831,7 +831,7 @@ class MultiNumericalFlagsTest(googletest
+ argv = ('./program', '--m_float2=def')
+ self.assertRaisesWithRegexpMatch(
+ gflags.IllegalFlagValue,
+- 'flag --m_float2=def: invalid literal for float\(\): def',
++ 'flag --m_float2=def: (invalid literal for float\(\)||could not convert string to float): def',
+ FLAGS, argv)
+
+
+
+------------------------------------------------------------------------