From 27d238d2954ff27b1c10f899479e54ed1ec00703 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Wed, 19 Mar 2014 10:37:08 +0900
Subject: [PATCH] Work around pypy testing issue

A recent release of setuptools appears to have introduced a bug that
causes the pypy gate tests to fail. This applies a temporary workaround
that should restore pypy testing while the root cause of the problem is
researched.

The work around is suggested in the comment in bug 1290562.

Change-Id: Iac2ec604447b1638550219cd2e407daf188f8ede
Partial-Bug: 1290562
---
 tox.ini | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tox.ini b/tox.ini
index a498e5261..65630888b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,11 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
+[testenv:pypy]
+deps = setuptools<3.2
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 commands = flake8
 distribute = false