X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=216f8901d5cd86257d62ed19fe43a21b10711d10;hp=8fb179e6389b6135145abc3241764f07fcb27197;hb=8ec910640c86e0551bb6a31b1c63115eb52e8756;hpb=00f0aef5739a19921ed06f0397b44ba336184424

diff --git a/tox.ini b/tox.ini
index 8fb179e..216f890 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34},{py26,py27,py34}-postgres,{py27,py34}-flake8
+toxworkdir={homedir}/.tox/sqlconvert
+envlist = {py26,py27,py34},{py26,py27,py34}-{postgres,sqlite},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -11,8 +12,8 @@ deps =
     py26: argparse
     py26,py27: SQLObject>=2.2.1
     py34: SQLObject>=3.0.0
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
+    m_lib>=3.1
+    m_lib.defenc>=1.0
     postgres: psycopg2
 sitepackages = True
 # Don't fail or warn on uninstalled commands
@@ -20,11 +21,15 @@ whitelist_externals =
     flake8
     createdb
     dropdb
+    cmp
+    rm
 
 [general]
 commands =
     python -m pytest --cov=sqlconvert
-    rm -f *.tmp
+    mysql2sql demo/demo.sql test.out
+    cmp -s tests/mysql2sql/test.out test.out
+    rm test.out
 
 [testenv:py26]
 commands = {[general]commands}
@@ -38,10 +43,10 @@ commands = {[general]commands}
 # PostgreSQL test environments
 [postgresql]
 commands =
+    -dropdb test
     createdb test
-    python -m pytest -D postgres:///test
+    python -m pytest --cov=sqlconvert -D postgres:///test
     dropdb test
-    rm -f *.tmp
 
 [testenv:py26-postgres]
 commands = {[postgresql]commands}
@@ -52,12 +57,28 @@ commands = {[postgresql]commands}
 [testenv:py34-postgres]
 commands = {[postgresql]commands}
 
+# SQLite test environments
+[sqlite]
+commands =
+    python -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
+    rm -f /tmp/test.sqdb
+
+[testenv:py26-sqlite]
+commands = {[sqlite]commands}
+
+[testenv:py27-sqlite]
+commands = {[sqlite]commands}
+
+[testenv:py34-sqlite]
+commands = {[sqlite]commands}
+
+# flake8
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8 demo scripts sqlconvert tests
+commands = flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8 demo scripts sqlconvert tests
+commands = flake8