diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/astng/files/pypy-test.patch | |
| download | gentoo-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/astng/files/pypy-test.patch')
| -rw-r--r-- | dev-python/astng/files/pypy-test.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-python/astng/files/pypy-test.patch b/dev-python/astng/files/pypy-test.patch new file mode 100644 index 000000000000..42cb3864b43b --- /dev/null +++ b/dev-python/astng/files/pypy-test.patch @@ -0,0 +1,36 @@ +diff -ur logilab-astng-0.24.3.orig/test/unittest_builder.py logilab-astng-0.24.3/test/unittest_builder.py +--- test/unittest_builder.py 2013-04-17 17:38:31.000000000 +0800 ++++ test/unittest_builder.py 2013-06-19 02:13:51.425269363 +0800 +@@ -62,8 +62,12 @@ + self.assertEqual(name.tolineno, 4) + strarg = callfunc.args[0] + self.assertIsInstance(strarg, nodes.Const) +- self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually) +- self.assertEqual(strarg.tolineno, 5) ++ if hasattr(sys, 'pypy_version_info'): ++ self.assertEqual(strarg.fromlineno, 4) # no way for this one (is 4 actually) ++ self.assertEqual(strarg.tolineno, 4) ++ else: ++ self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually) ++ self.assertEqual(strarg.tolineno, 5) + namearg = callfunc.args[1] + self.assertIsInstance(namearg, nodes.Name) + self.assertEqual(namearg.fromlineno, 5) +diff -ur logilab-astng-0.24.3.orig/test/unittest_inference.py logilab-astng-0.24.3/test/unittest_inference.py +--- test/unittest_inference.py 2013-04-17 17:38:31.000000000 +0800 ++++ test/unittest_inference.py 2013-06-19 02:52:41.618270007 +0800 +@@ -710,8 +710,12 @@ + node = get_name_node(astng, 'open', -1) + infered = list(node.infer()) + self.assertEqual(len(infered), 1) +- self.assertIsInstance(infered[0], nodes.Function) +- self.assertEqual(infered[0].name, 'open') ++ if hasattr(sys, 'pypy_version_info'): ++ self.assertIsInstance(infered[0], nodes.Class) ++ self.assertEqual(infered[0].name, 'file') ++ else: ++ self.assertIsInstance(infered[0], nodes.Function) ++ self.assertEqual(infered[0].name, 'open') + + def test_callfunc_context_func(self): + code = ''' |
