Use python2 for tests because for travis, fix valgrind list1 test

diff --git a/tests/cached/valgrind-supressions b/tests/cached/valgrind-supressions
new file mode 120000 (symlink)
index 0000000..e409c1e
--- /dev/null
+++ b/tests/cached/valgrind-supressions
@@ -0,0 +1 @@
+../valgrind-supressions
\ No newline at end of file

diff --git a/tests/functions b/tests/functions
index cafb5abf0276529cf32844c9c08e6a2e0c9d454d..bf6ed5a89b982e0b782dd8e95303cca3e9fa0f27 100644 (file)
--- a/tests/functions
+++ b/tests/functions
@@ -204,10 +204,11 @@ function run_cached {
             export RRDTOOL=RRDTOOLCOMPAT
 
             randport=$(python -S -c "import random; random.seed('$(basename $0)'); print(random.randrange(49152,65535))")
-            port=$(python -S << HERE
-import socketserver
-with socketserver.TCPServer(("localhost", 0), None) as s:
-  print(s.server_address[1])
+            port=$(python2 -S << HERE
+import SocketServer
+s = SocketServer.TCPServer(("localhost", 0), None)
+print(s.server_address[1])
+s.server_close()
 HERE
 )
             ADDR="localhost:$port"