mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 04:47:28 -07:00
56bd759df1
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
25 lines
927 B
Diff
25 lines
927 B
Diff
Ignore the exception detail for two exceptions that are slightly
|
|
different on pypy.
|
|
|
|
diff -r 7f90a96378ed tests/test_template.txt
|
|
--- a/tests/test_template.txt Mon Mar 05 21:14:08 2012 +0100
|
|
+++ b/tests/test_template.txt Wed May 16 23:29:46 2012 +0200
|
|
@@ -6,7 +6,7 @@
|
|
'Hi Ian'
|
|
>>> Template('Hi {{repr(name)}}').substitute(name='Ian')
|
|
"Hi 'Ian'"
|
|
- >>> Template('Hi {{name+1}}').substitute(name='Ian')
|
|
+ >>> Template('Hi {{name+1}}').substitute(name='Ian') #doctest: +IGNORE_EXCEPTION_DETAIL
|
|
Traceback (most recent call last):
|
|
...
|
|
TypeError: cannot concatenate 'str' and 'int' objects at line 1 column 6
|
|
@@ -125,7 +125,7 @@
|
|
>>> sub('{{default x=1}}{{x}}')
|
|
'1'
|
|
>>> # The normal case:
|
|
- >>> sub('{{x}}')
|
|
+ >>> sub('{{x}}') #doctest: +IGNORE_EXCEPTION_DETAIL
|
|
Traceback (most recent call last):
|
|
...
|
|
NameError: name 'x' is not defined at line 1 column 3
|