Fix python 3.3 tests

We can go back to using the official release of
testrepository for testing under python 3, so
do.

Make python 3.3 part of the default environment
set for anyone running all of the tests.

Change-Id: I0c56f9cde643ef8580ab305080bc62b87809bf7e

test-requirements-py3.txt

@@ -1,10 +0,0 @@
-coverage>=3.6
-discover
-fixtures>=0.3.12
-flake8
-python-subunit
-sphinx>=1.1.2
--e bzr+lp:testrepository#egg=testrepository
-testresources
-testscenarios
-testtools>=0.9.27

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pep8
+envlist = py26,py27,py33,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -11,10 +11,6 @@ deps = -r{toxinidir}/requirements.txt
 commands =
   python setup.py testr --testr-args='{posargs}'
 
-[testenv:py33]
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements-py3.txt
-
 [tox:jenkins]
 sitepackages = True
 downloadcache = ~/cache/pip