[ovs-dev] [PATCH] tests: Add some Python3 test variants on ovsdb-idl.at
Timothy Redaelli
tredaelli at redhat.com
Fri Mar 9 16:49:39 UTC 2018
Execute the "passive tcp", "fetch columns", "idl notify" and
"idl notify SSL" tests also using Python3 (when available).
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
---
tests/ovsdb-idl.at | 56 ++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 40 insertions(+), 16 deletions(-)
diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at
index 59b2c1991..01660a12f 100644
--- a/tests/ovsdb-idl.at
+++ b/tests/ovsdb-idl.at
@@ -140,9 +140,9 @@ m4_define([OVSDB_CHECK_IDL],
OVSDB_CHECK_IDL_TCP6_PY($@)])
# This test uses the Python IDL implementation with passive tcp
-m4_define([OVSDB_CHECK_IDL_PASSIVE_TCP_PY],
- [AT_SETUP([$1 - Python ptcp])
- AT_SKIP_IF([test $HAVE_PYTHON = no])
+m4_define([OVSDB_CHECK_IDL_PASSIVE_TCP_PYN],
+ [AT_SETUP([$1 ptcp])
+ AT_SKIP_IF([test $7 = no])
AT_KEYWORDS([ovsdb server idl positive Python with tcp socket $5])
# find free TCP port
AT_CHECK([ovsdb_start_idltest "ptcp:0:127.0.0.1"])
@@ -152,7 +152,7 @@ m4_define([OVSDB_CHECK_IDL_PASSIVE_TCP_PY],
# start OVSDB server in passive mode
AT_CHECK([ovsdb_start_idltest "tcp:127.0.0.1:$TCP_PORT"])
- AT_CHECK([$PYTHON $srcdir/test-ovsdb.py -t10 idl_passive $srcdir/idltest.ovsschema ptcp:127.0.0.1:$TCP_PORT $3],
+ AT_CHECK([$8 $srcdir/test-ovsdb.py -t10 idl_passive $srcdir/idltest.ovsschema ptcp:127.0.0.1:$TCP_PORT $3],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]),
[0], [$4])
@@ -160,6 +160,12 @@ m4_define([OVSDB_CHECK_IDL_PASSIVE_TCP_PY],
AT_CLEANUP
])
+m4_define([OVSDB_CHECK_IDL_PASSIVE_TCP_PY],
+ [OVSDB_CHECK_IDL_PASSIVE_TCP_PYN([$1 - Python2], [$2], [$3], [$4], [$5], [$6],
+ [$HAVE_PYTHON], [$PYTHON])
+ OVSDB_CHECK_IDL_PASSIVE_TCP_PYN([$1 - Python3], [$2], [$3], [$4], [$5], [$6],
+ [$HAVE_PYTHON3], [$PYTHON3])])
+
OVSDB_CHECK_IDL_PASSIVE_TCP_PY([simple passive idl, initially empty, select empty],
[],
[['["idltest",{"op":"select","table":"link1","where":[]}]']],
@@ -803,20 +809,26 @@ AT_CHECK([grep '"monitor\|monitor_cond"' stderr | grep -c '"ua"'], [0], [1
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP
-m4_define([OVSDB_CHECK_IDL_FETCH_COLUMNS_PY],
- [AT_SETUP([$1 - Python fetch])
- AT_SKIP_IF([test $HAVE_PYTHON = no])
+m4_define([OVSDB_CHECK_IDL_FETCH_COLUMNS_PYN],
+ [AT_SETUP([$1 fetch])
+ AT_SKIP_IF([test $8 = no])
AT_KEYWORDS([ovsdb server idl positive Python increment fetch $6])
AT_CHECK([ovsdb_start_idltest])
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
- AT_CHECK([$PYTHON $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket [$3] $4],
+ AT_CHECK([$9 $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket [$3] $4],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$7],,, [[| $7]]),
[0], [$5])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
+m4_define([OVSDB_CHECK_IDL_FETCH_COLUMNS_PY],
+ [OVSDB_CHECK_IDL_FETCH_COLUMNS_PYN([$1 - Python2], [$2], [$3], [$4], [$5], [$6], [$7],
+ [$HAVE_PYTHON], [$PYTHON])
+ OVSDB_CHECK_IDL_FETCH_COLUMNS_PYN([$1 - Python3], [$2], [$3], [$4], [$5], [$6], [$7],
+ [$HAVE_PYTHON3], [$PYTHON3])])
+
m4_define([OVSDB_CHECK_IDL_FETCH_COLUMNS],
[OVSDB_CHECK_IDL_FETCH_COLUMNS_PY($@)])
@@ -1181,24 +1193,30 @@ OVSDB_CHECK_IDL_PY([partial-set idl],
015: done
]])
-m4_define([OVSDB_CHECK_IDL_NOTIFY_PY],
- [AT_SETUP([$1 - Python])
- AT_SKIP_IF([test $HAVE_PYTHON = no])
+m4_define([OVSDB_CHECK_IDL_NOTIFY_PYN],
+ [AT_SETUP([$1])
+ AT_SKIP_IF([test $6 = no])
AT_KEYWORDS([ovsdb server idl Python notify $4])
AT_CHECK([ovsdb_start_idltest])
- AT_CHECK([$PYTHON $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket $2],
+ AT_CHECK([$7 $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket $2],
[0], [stdout], [ignore], [kill `cat pid`])
AT_CHECK([sort stdout | uuidfilt]m4_if([$5],,, [[| $5]]),
[0], [$3], [], [kill `cat pid`])
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
+m4_define([OVSDB_CHECK_IDL_NOTIFY_PY],
+ [OVSDB_CHECK_IDL_NOTIFY_PYN([$1 - Python2], [$2], [$3], [$4], [$5],
+ [$HAVE_PYTHON], [$PYTHON])
+ OVSDB_CHECK_IDL_NOTIFY_PYN([$1 - Python3], [$2], [$3], [$4], [$5],
+ [$HAVE_PYTHON3], [$PYTHON3])])
+
# This test uses the Python IDL implementation with ssl
-m4_define([OVSDB_CHECK_IDL_NOTIFY_SSL_PY],
+m4_define([OVSDB_CHECK_IDL_NOTIFY_SSL_PYN],
[AT_SETUP([$1 - SSL])
AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
- AT_SKIP_IF([test $HAVE_PYTHON = no])
- $PYTHON -c "import OpenSSL.SSL"
+ AT_SKIP_IF([test $6 = no])
+ $7 -c "import OpenSSL.SSL"
SSL_PRESENT=$?
AT_SKIP_IF([test $SSL_PRESENT != 0])
AT_KEYWORDS([ovsdb server idl Python notify - ssl socket])
@@ -1213,7 +1231,7 @@ m4_define([OVSDB_CHECK_IDL_NOTIFY_SSL_PY],
--remote=pssl:0:127.0.0.1 db])
on_exit 'kill `cat ovsdb-server.pid`'
PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT])
- AT_CHECK([$PYTHON $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema \
+ AT_CHECK([$7 $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema \
ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
$PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem $2],
[0], [stdout], [ignore], [kill `cat pid`])
@@ -1222,6 +1240,12 @@ m4_define([OVSDB_CHECK_IDL_NOTIFY_SSL_PY],
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP])
+m4_define([OVSDB_CHECK_IDL_NOTIFY_SSL_PY],
+ [OVSDB_CHECK_IDL_NOTIFY_SSL_PYN([$1 - Python2], [$2], [$3], [$4], [$5],
+ [$HAVE_PYTHON], [$PYTHON])
+ OVSDB_CHECK_IDL_NOTIFY_SSL_PYN([$1 - Python3], [$2], [$3], [$4], [$5],
+ [$HAVE_PYTHON3], [$PYTHON3])])
+
m4_define([OVSDB_CHECK_IDL_NOTIFY],
[OVSDB_CHECK_IDL_NOTIFY_PY($@)
OVSDB_CHECK_IDL_NOTIFY_SSL_PY($@)])
--
2.14.3
More information about the dev
mailing list