Merge pull request #137 from pipermerriam/piper/speed-up-tests

reduce test run overhead
ethereum · Dec 28, 2016 · 1f8e753 · 1f8e753
2 parents 3ecb888 + 57dc82a
commit 1f8e753
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 57 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,62 +9,9 @@ before_install:
   - travis_retry sudo apt-get update
 env:
   matrix:
-    # admin
-    - TOX_ENV=py27-admin
-    - TOX_ENV=py34-admin
-    - TOX_ENV=py35-admin
-    # eth
-    - TOX_ENV=py27-eth
-    - TOX_ENV=py34-eth
-    - TOX_ENV=py35-eth
-    # mining
-    - TOX_ENV=py27-mining
-    - TOX_ENV=py34-mining
-    - TOX_ENV=py35-mining
-    # providers
-    - TOX_ENV=py27-providers
-    - TOX_ENV=py34-providers
-    - TOX_ENV=py35-providers
-    # version
-    - TOX_ENV=py27-version
-    - TOX_ENV=py34-version
-    - TOX_ENV=py35-version
-    # contracts
-    - TOX_ENV=py27-contracts
-    - TOX_ENV=py34-contracts
-    - TOX_ENV=py35-contracts
-    # filtering
-    - TOX_ENV=py27-filtering
-    - TOX_ENV=py34-filtering
-    - TOX_ENV=py35-filtering
-    # net
-    - TOX_ENV=py27-net
-    - TOX_ENV=py34-net
-    - TOX_ENV=py35-net
-    # shh
-    - TOX_ENV=py27-shh
-    - TOX_ENV=py34-shh
-    - TOX_ENV=py35-shh
-    # txpool
-    - TOX_ENV=py27-txpool
-    - TOX_ENV=py34-txpool
-    - TOX_ENV=py35-txpool
-    # db
-    - TOX_ENV=py27-db
-    - TOX_ENV=py34-db
-    - TOX_ENV=py35-db
-    # managers
-    - TOX_ENV=py27-managers
-    - TOX_ENV=py34-managers
-    - TOX_ENV=py35-managers
-    # personal
-    - TOX_ENV=py27-personal
-    - TOX_ENV=py34-personal
-    - TOX_ENV=py35-personal
-    # utilities
-    - TOX_ENV=py27-utilities
-    - TOX_ENV=py34-utilities
-    - TOX_ENV=py35-utilities
+    - TOX_ENV=py27-all
+    - TOX_ENV=py34-all
+    - TOX_ENV=py35-all
     - TOX_ENV=flake8
 cache:
   pip: true

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py{27,34,35}-{admin,eth,mining,providers,version,contracts,filtering,net,txpool,db,managers,personal,utilities}
+    py{27,34,35}-{all,admin,eth,mining,providers,version,contracts,filtering,net,txpool,db,managers,personal,utilities}
     flake8
 
 [flake8]
@@ -10,6 +10,7 @@ exclude= tests/*
 [testenv]
 usedevelop=True
 commands=
+    all: py.test {posargs:tests}
     admin: py.test {posargs:tests/admin-module}
     eth: py.test {posargs:tests/eth-module}
     mining: py.test {posargs:tests/mining-module}