From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 18 Jun 2012 07:30:11 +0000 (-0700)
Subject: Add a pypy-full test configuration.
X-Git-Tag: v2.4.0~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a310102c71524fa5d88862c4e88d248c3314cb99;p=thirdparty%2Ftornado.git

Add a pypy-full test configuration.

Pypy compatibility has improved to the point that we can run twisted_test
under it (with one small issue that we can work around).
---

diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
index 7862c87ff..78542a7a4 100644
--- a/tornado/test/twisted_test.py
+++ b/tornado/test/twisted_test.py
@@ -261,7 +261,7 @@ class ReactorReaderWriterTest(ReactorTestCase):
         self.shouldWrite = True
 
         def checkReadInput(fd):
-            self.assertEquals(fd.read(), 'x')
+            self.assertEquals(fd.read(1), 'x')
             self._reactor.stop()
 
         def writeOnce(fd):
diff --git a/tox.ini b/tox.ini
index 27189a48e..6f841e4c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -67,9 +67,15 @@ deps =
      twisted>=11.1.0
 commands = python -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient {posargs:}
 
-# No pypy-full yet: pycurl doesn't build with pypy, and installing
-# twisted under pypy takes a *very* long time.  MySQL-python builds with
-# pypy, but doesn't work.
+[testenv:pypy-full]
+# This configuration works with pypy 1.9.  pycurl installs ok but
+# curl_httpclient doesn't work.  Also note that travis-ci does not yet
+# have support for building C extensions with pypy, so we don't try to
+# run this configuration there.
+basepython = pypy
+deps =
+     MySQL-python
+     twisted>=12.1.0
 
 # In python 3, opening files in text mode uses a system-dependent encoding by
 # default.  Run the tests with "C" (ascii) and "utf-8" locales to ensure