From: Oleg Broytman Date: Wed, 13 Dec 2023 19:39:27 +0000 (+0300) Subject: Fix(Py3): Use a different test file for Python 3.5+ X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=1526d94cfa10aa68de1330b1c24ef0d99f8b2b0d;p=sqlconvert.git Fix(Py3): Use a different test file for Python 3.5+ --- diff --git a/tests/mysql2sql/test.out b/tests/mysql2sql/test.out2 similarity index 100% rename from tests/mysql2sql/test.out rename to tests/mysql2sql/test.out2 diff --git a/tests/mysql2sql/test.out3 b/tests/mysql2sql/test.out3 new file mode 100644 index 0000000..462e2be --- /dev/null +++ b/tests/mysql2sql/test.out3 @@ -0,0 +1,20 @@ +CREATE TABLE mytable ( + id int(10) unsigned NOT NULL AUTO_INCREMENT, + date datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + flag tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (id), + UNIQUE KEY date (date) +) ENGINE="InnoDB" DEFAULT CHARSET=utf8; +INSERT INTO /* inline comment */ mytable VALUES (1, 'тест'); +SELECT * FROM mytable; -- line-comment" + +; +INSERT INTO "MyTable" ("Id", "Name") +VALUES (1, 'one'); +INSERT INTO mytable VALUES (1, 'one'); + +INSERT INTO mytable VALUES (2, 'two'); +INSERT INTO mytable (id, name) VALUES (1, 'one'); + +INSERT INTO mytable (id, name) VALUES (2, 'two'); +-- The end diff --git a/tox.ini b/tox.ini index 6eaedf2..78a7970 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.15 -envlist = py27,py3{4,5,6,7,8,9,10,11}{,-sqlite},py{27,36,311}-flake8 +envlist = py27,py3{4,5,6,7,8,9,10,11}{,-m2s,-sqlite},py{27,36,311}-flake8 # Base test environment settings [testenv] @@ -22,8 +22,19 @@ whitelist_externals = commands = {[testenv]commands} {envpython} -m pytest + +[testenv:py{27,34}-m2s] +commands = + {[testenv]commands} + {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out + cmp.py -i tests/mysql2sql/test.out2 test.out + rm.py -f test.out + +[testenv:py{35,36,37,38,39,310,311}-m2s] +commands = + {[testenv]commands} {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out - cmp.py -i tests/mysql2sql/test.out test.out + cmp.py -i tests/mysql2sql/test.out3 test.out rm.py -f test.out [testenv:py{27,34,35,36,37,38,39,310,311}-sqlite]