generate_default_envs: fix find_and_add to skip existing variations

Author: blueyed

.travis.yml

@@ -4,39 +4,25 @@ language: python
 python:
   - "3.4"
 env:
-  - TESTENV=pypy-master-sqlite_file
-  - TESTENV=pypy3-master-sqlite_file
   - TESTENV=python2.6-1.6-sqlite_file
   - TESTENV=python2.7-1.3-sqlite_file
   - TESTENV=python2.7-1.4-sqlite_file
   - TESTENV=python2.7-1.5-sqlite_file
   - TESTENV=python2.7-1.6-sqlite_file
   - TESTENV=python2.7-1.7-sqlite_file
   - TESTENV=python2.7-1.8-sqlite_file
-  - TESTENV=python2.7-master-mysql_innodb
-  - TESTENV=python2.7-master-mysql_myisam
   - TESTENV=python2.7-master-sqlite_file
-  - TESTENV=python3.2-master-sqlite_file
-  - TESTENV=python3.3-master-sqlite_file
   - TESTENV=python3.4-1.5-sqlite_file
   - TESTENV=python3.4-1.6-sqlite_file
   - TESTENV=python3.4-1.7-sqlite_file
   - TESTENV=python3.4-1.8-sqlite_file
-  - TESTENV=python3.4-master-postgres
   - TESTENV=python3.4-master-sqlite
   - TESTENV=python3.4-master-sqlite_file
   - TESTENV=checkqa-python2.7
   - TESTENV=checkqa-python3.4
 matrix:
   allow_failures:
-    - env: TESTENV=pypy-master-sqlite_file
-    - env: TESTENV=pypy3-master-sqlite_file
-    - env: TESTENV=python2.7-master-mysql_innodb
-    - env: TESTENV=python2.7-master-mysql_myisam
     - env: TESTENV=python2.7-master-sqlite_file
-    - env: TESTENV=python3.2-master-sqlite_file
-    - env: TESTENV=python3.3-master-sqlite_file
-    - env: TESTENV=python3.4-master-postgres
     - env: TESTENV=python3.4-master-sqlite
     - env: TESTENV=python3.4-master-sqlite_file
 install:

generate_configurations.py

@@ -156,6 +156,10 @@ def generate_default_envs(envs):
 
     def find_and_add(variations, env_getter):
         for variation in variations:
+            for existing in result:
+                if env_getter(existing) == variation:
+                    return
+
             for env in reversed(envs):
                 if env_getter(env) == variation:
                     result.add(env)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy-master-sqlite_file,pypy3-master-sqlite_file,python2.6-1.6-sqlite_file,python2.7-1.3-sqlite_file,python2.7-1.4-sqlite_file,python2.7-1.5-sqlite_file,python2.7-1.6-sqlite_file,python2.7-1.7-sqlite_file,python2.7-1.8-sqlite_file,python2.7-master-mysql_innodb,python2.7-master-mysql_myisam,python2.7-master-sqlite_file,python3.2-master-sqlite_file,python3.3-master-sqlite_file,python3.4-1.5-sqlite_file,python3.4-1.6-sqlite_file,python3.4-1.7-sqlite_file,python3.4-1.8-sqlite_file,python3.4-master-postgres,python3.4-master-sqlite,python3.4-master-sqlite_file,checkqa-python2.7,checkqa-python3.4
+envlist = python2.6-1.6-sqlite_file,python2.7-1.3-sqlite_file,python2.7-1.4-sqlite_file,python2.7-1.5-sqlite_file,python2.7-1.6-sqlite_file,python2.7-1.7-sqlite_file,python2.7-1.8-sqlite_file,python2.7-master-sqlite_file,python3.4-1.5-sqlite_file,python3.4-1.6-sqlite_file,python3.4-1.7-sqlite_file,python3.4-1.8-sqlite_file,python3.4-master-sqlite,python3.4-master-sqlite_file,checkqa-python2.7,checkqa-python3.4
 
 [testenv]
 whitelist_externals =