mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-11 14:17:27 -08: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
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
tests/tests.py | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/tests.py b/tests/tests.py
|
|
index d210bc6..71f8074 100644
|
|
--- a/tests/tests.py
|
|
+++ b/tests/tests.py
|
|
@@ -11,6 +11,7 @@ try:
|
|
except ImportError:
|
|
import simplejson as json
|
|
import math
|
|
+import nose
|
|
import platform
|
|
import sys
|
|
import time
|
|
@@ -24,9 +25,10 @@ from functools import partial
|
|
|
|
PY3 = (sys.version_info[0] >= 3)
|
|
|
|
-def _python_ver(skip_major, skip_minor=None):
|
|
+def _skip_if_python_ver(skip_major, skip_minor=None):
|
|
major, minor = sys.version_info[:2]
|
|
- return major == skip_major and (skip_minor is None or minor == skip_minor)
|
|
+ if major == skip_major and (skip_minor is None or minor == skip_minor):
|
|
+ raise nose.SkipTest
|
|
|
|
json_unicode = (json.dumps if sys.version_info[0] >= 3
|
|
else partial(json.dumps, encoding="utf-8"))
|
|
@@ -579,8 +581,8 @@ class UltraJSONTests(TestCase):
|
|
input = "-31337"
|
|
self.assertEquals (-31337, ujson.decode(input))
|
|
|
|
- #@unittest.skipIf(_python_ver(3), "No exception in Python 3")
|
|
def test_encodeUnicode4BytesUTF8Fail(self):
|
|
+ _skip_if_python_ver(3)
|
|
input = "\xfd\xbf\xbf\xbf\xbf\xbf"
|
|
try:
|
|
enc = ujson.encode(input)
|