X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=c360621c994e75fa7ea3ca15a5c4c56bd69600b8;hp=abc744d7ec549428d227b9077d301f919314a7be;hb=f759666e045e7bb0a8b2ff3379b9d46c83c37c67;hpb=94178a9c8a0ce429a21eb511646ba1abe6d12dc2

diff --git a/tox.ini b/tox.ini
index abc744d..c360621 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
+envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,postgres-w32,sqlite,sqlite-w32},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -13,16 +13,9 @@ commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    pytest
-    pytest-cov
-    py26: argparse
-    sqlparse
-    py2{6,7}: SQLObject>=2.2.1
-    py3{4,5,6}: SQLObject>=3.0.0
-    m_lib>=3.1
-    m_lib.defenc>=1.0
-    ppu
+    -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2
+passenv = PGPASSWORD
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
@@ -38,9 +31,6 @@ commands =
     {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out
     {envpython} {envbindir}/rm.py test.out
 
-[testenv:py26]
-commands = {[general]commands}
-
 [testenv:py27]
 commands = {[general]commands}
 
@@ -57,13 +47,10 @@ commands = {[general]commands}
 [postgresql]
 commands =
     {[testenv]commands}
-    -dropdb test
-    createdb test
-    {envpython} -m pytest --cov=sqlconvert -D postgres:///test
-    dropdb test
-
-[testenv:py26-postgres]
-commands = {[postgresql]commands}
+    -dropdb -U postgres -w test
+    createdb -U postgres -w test
+    {envpython} -m pytest --cov=sqlconvert -D postgres://postgres:@localhost/test
+    dropdb -U postgres -w test
 
 [testenv:py27-postgres]
 commands = {[postgresql]commands}
@@ -77,16 +64,34 @@ commands = {[postgresql]commands}
 [testenv:py36-postgres]
 commands = {[postgresql]commands}
 
+[postgres-w32]
+commands =
+    {[testenv]commands}
+    -dropdb -U postgres -w test
+    createdb -U postgres -w test
+    pytest --cov=sqlconvert -D "postgres://postgres:Password12!@localhost/test"
+    dropdb -U postgres -w test
+
+[testenv:py27-postgres-w32]
+commands = {[postgres-w32]commands}
+
+[testenv:py34-postgres-w32]
+commands = {[postgres-w32]commands}
+
+[testenv:py35-postgres-w32]
+commands = {[postgres-w32]commands}
+
+[testenv:py36-postgres-w32]
+commands = {[postgres-w32]commands}
+
 # SQLite test environments
 [sqlite]
 commands =
     {[testenv]commands}
+    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
     {envpython} {envbindir}/rm.py /tmp/test.sqdb
 
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
-
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}
 
@@ -99,6 +104,22 @@ commands = {[sqlite]commands}
 [testenv:py36-sqlite]
 commands = {[sqlite]commands}
 
+[sqlite-w32]
+commands =
+    {[testenv]commands}
+    -{envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb
+    pytest --cov=sqlconvert -D sqlite:/C:/projects/sqlconvert/test.sqdb?debug=1
+    {envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb
+
+[testenv:py27-sqlite-w32]
+commands = {[sqlite-w32]commands}
+
+[testenv:py34-sqlite-w32]
+commands = {[sqlite-w32]commands}
+
+[testenv:py35-sqlite-w32]
+commands = {[sqlite-w32]commands}
+
 # flake8
 [testenv:py27-flake8]
 deps =