Merge lp:~jan-kneschke/mysql-proxy/test-suite-refactoring into lp:mysql-proxy

[Jan Kneschke]

As a side-effect of fixing http://bugs.mysql.com/37630 the test-suite had to be refactored to not call get_pid() on the PID-file for shutting the proxy down.

This rewrite changes the test-runner to use proper OO-style to store the state of:
* commands it wants to run
* processes that it tracks
* proxy's and their options and environments

The helper functions that check paths, shell, ... are split out into modules under testenv.*

[Leith (mleith)]

Looks good to me. A few very minor comments (with the first being the only one needing to be resolved):

 - No copyright/licenses headers have had the date updated.. Please do that

 - Can we keep this comment on one line:
  + /* only try to delete the PID if we created it
 + */

 - Why hard code the following to MySQLProxy:get_args()?:
 + opts["plugins"] = "proxy"
 + opts["daemon"] = true

 - This looks incomplete, what is the plan here?:
 + if extra_params then
 + -- FIXME: implement me
 + end

 - Bug#38415 has been fixed now (https://code.launchpad.net/~schuster/mysql-proxy/remove_unix_socket/+merge/23652), we can just remove the following now:

 + -- if we are supposed to listen on a UNIX socket, remove it first, because we don't clean it up on exit!
 + -- TODO: fix the code, instead of hacking around here! Bug#38415
 + if proxy_options['proxy-address'] == '/tmp/mysql-proxy-test.sock' then
 + os.remove(proxy_options['proxy-address'])
 + end

 - I see changes to Makefile.am, but none to any CMakeLists.txt files, I understand that the test suite does not run on Windows yet, however I'd also like us to move towards cmake as the one true source as well. Please consider making it so that cmake can still build all of this on *nix, and opening a new issue to get the test suite working on Windows as well.

review: Needs Fixing

[Jan Kneschke (jan-kneschke)]

Am 07.09.2010 um 11:41 schrieb Leith:

> Review: Needs Fixing
> Looks good to me. A few very minor comments (with the first being the only one needing to be resolved):
>
> - No copyright/licenses headers have had the date updated.. Please do that

added the copyright headers to all the testenv/ files.

> - Can we keep this comment on one line:
> + /* only try to delete the PID if we created it
> + */

done.

> - Why hard code the following to MySQLProxy:get_args()?:
> + opts["plugins"] = "proxy"
> + opts["daemon"] = true

because we only want to run the 'proxy' plugin and want to run it all as daemon all the time.

We don't want the admin plugin to be loaded here as it would only make it more complicated to setup the ports for it. As we don't use it, we don't load it for these tests.

> - This looks incomplete, what is the plan here?:
> + if extra_params then
> + -- FIXME: implement me
> + end

I removed it.

> - Bug#38415 has been fixed now (https://code.launchpad.net/~schuster/mysql-proxy/remove_unix_socket/+merge/23652), we can just remove the following now:
>
> + -- if we are supposed to listen on a UNIX socket, remove it first, because we don't clean it up on exit!
> + -- TODO: fix the code, instead of hacking around here! Bug#38415
> + if proxy_options['proxy-address'] == '/tmp/mysql-proxy-test.sock' then
> + os.remove(proxy_options['proxy-address'])
> + end

Will post-pone remove this until #38415 is marked as "closed".

> - I see changes to Makefile.am, but none to any CMakeLists.txt files, I understand that the test suite does not run on Windows yet, however I'd also like us to move towards cmake as the one true source as well. Please consider making it so that cmake can still build all of this on *nix, and opening a new issue to get the test suite working on Windows as well.

Let's move this into an extra task. The current suite has only files for the automake case.

> --
> https://code.launchpad.net/~jan-kneschke/mysql-proxy/test-suite-refactoring/+merge/34720
> You are the owner of lp:~jan-kneschke/mysql-proxy/test-suite-refactoring.

Jan

[Leith (mleith)]

The current files also need the year updating to 2010 where appropriate as well.

review: Needs Fixing

[Leith (mleith)]

OK, still slightly wrong, the copyright header should be:

"Copyright (c) $start, $end, Oracle and/or its affiliates. All rights reserved."

So please change the likes of:

Copyright (c) 2007, 2008, 2010, Oracle and/or its affiliates. All rights reserved.

To:

Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.

review: Needs Fixing

[Leith (mleith)]

Looks good.

review: Approve

=== modified file 'configure.in'
--- configure.in	2010-05-25 13:44:43 +0000
+++ configure.in	2010-09-08 12:58:43 +0000
@@ -407,6 +407,7 @@
 		 lib/proxy/Makefile \
 		 tests/Makefile \
 		 tests/suite/Makefile \
+		 tests/suite/testenv/Makefile \
 		 tests/suite/base/Makefile \
 		 tests/suite/base/t/Makefile \
 		 tests/suite/base/r/Makefile \
 
=== modified file 'lib/glib2.c'
--- lib/glib2.c	2010-08-20 15:02:44 +0000
+++ lib/glib2.c	2010-09-08 12:58:43 +0000
@@ -1,5 +1,5 @@
 /* $%BEGINLICENSE%$
- Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
@@ -33,6 +33,16 @@
 	return 0;
 }
 
+static int lua_g_setenv (lua_State *L) {
+	const char * key = luaL_checkstring (L, 1);
+	const char * value = luaL_checkstring (L, 2);
+	int overwrite = luaL_optint(L, 3, 1);
+
+	lua_pushboolean(L, g_setenv(key, value, overwrite));
+
+	return 1;
+}
+
 static int lua_g_get_current_time (lua_State *L) {
 	GTimeVal t;
 
@@ -83,6 +93,7 @@
 	{"usleep", lua_g_usleep},
 	{"md5", lua_g_checksum_md5},
 	{"get_current_time", lua_g_get_current_time},
+	{"setenv", lua_g_setenv},
 	{NULL, NULL},
 };
 
 
=== modified file 'lib/posix.c'
--- lib/posix.c	2008-11-11 17:09:04 +0000
+++ lib/posix.c	2010-09-08 12:58:43 +0000
@@ -1,9 +1,28 @@
-/* Copyright (C) 2008 MySQL AB */
+/* $%BEGINLICENSE%$
+ Copyright (c) 2008, 2010 Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -27,6 +46,14 @@
 	return 1;
 }
 
+static int lua_getcwd (lua_State *L) {
+	char cwd[MAXPATHLEN];
+
+	lua_pushstring (L, getcwd(cwd, sizeof(cwd)));
+
+	return 1;
+}
+
 static int lua_getpwuid(lua_State *L) {
 	struct passwd *p;
 	int uid = luaL_checkinteger (L, 1);
@@ -76,6 +103,7 @@
 	{"getpid", lua_getpid},
 	{"getuid", lua_getuid},
 	{"getpwuid", lua_getpwuid},
+	{"getcwd", lua_getcwd},
 	{NULL, NULL},
 };
 
 
=== modified file 'src/mysql-proxy-cli.c'
--- src/mysql-proxy-cli.c	2010-09-02 12:05:35 +0000
+++ src/mysql-proxy-cli.c	2010-09-08 12:58:43 +0000
@@ -56,6 +56,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gstdio.h> /* g_unlink() */
 #include <gmodule.h>
 
 #ifdef HAVE_LUA_H
@@ -115,6 +116,7 @@
 	GOptionEntry *config_entries;
 
 	gchar *pid_file;
+	gboolean pid_file_is_created;
 
 	gchar *plugin_dir;
 	gchar **plugin_names;
@@ -166,7 +168,13 @@
 	if (frontend->user) g_free(frontend->user);
 	if (frontend->log_filename) g_free(frontend->log_filename);
 	if (frontend->log_config_filename) g_free(frontend->log_config_filename);
-	if (frontend->pid_file) g_free(frontend->pid_file);
+	if (frontend->pid_file) {
+		/* only try to delete the PID if we created it */
+		if (frontend->pid_file_is_created) {
+			g_unlink(frontend->pid_file);
+		}
+		g_free(frontend->pid_file);
+	}
 	if (frontend->log_level) g_free(frontend->log_level);
 	if (frontend->plugin_dir) g_free(frontend->plugin_dir);
 
@@ -591,6 +599,7 @@
 
 			GOTO_EXIT(EXIT_FAILURE);
 		}
+		frontend->pid_file_is_created = TRUE; /* track that we created the PID file successfully and can delete it */
 	}
 
 	/* the message has to be _after_ the g_option_content_parse() to 
 
=== modified file 'tests/suite/Makefile.am'
--- tests/suite/Makefile.am	2009-09-22 15:13:32 +0000
+++ tests/suite/Makefile.am	2010-09-08 12:58:43 +0000
@@ -1,8 +1,9 @@
-SUBDIRS=base bugs
+SUBDIRS=testenv base bugs
 
 TESTS_ENVIRONMENT = \
 	MYSQL_TEST_BIN="${MYSQL_TEST_BIN}" \
 	LUA_USER_PATH="${top_srcdir}/lib/?.lua" \
+	LUA_PATH="${top_srcdir}/tests/suite/?.lua" \
 	LUA_CPATH=".libs/?.@DYNLIB_LUA_SUFFIX@;${top_builddir}/lib/.libs/?.@DYNLIB_LUA_SUFFIX@" \
 	@DYNLIB_PATH_VAR@="${top_builddir}/src/.libs/:${@DYNLIB_PATH_VAR@}" \
 	MYSQL_PROXY_VERSION="${PACKAGE_VERSION}" \
@@ -24,6 +25,9 @@
 
 EXTRA_DIST=\
 	run-tests.lua \
+	fileutils.lua \
+	shellutils.lua \
+	testutils.lua \
 	lua-tests-wrapper.sh.in \
 	CMakeLists.txt
 
 
=== modified file 'tests/suite/base/r/lineno.result'
--- tests/suite/base/r/lineno.result	2009-09-21 14:34:47 +0000
+++ tests/suite/base/r/lineno.result	2010-09-08 12:58:43 +0000
@@ -1,4 +1,4 @@
 SELECT backtrace;
 backtrace
 stack traceback:
-	[string "/tmp/dummy.lua"]:48: in function <[string "/tmp/dummy.lua"]:32>
+	[string "lineno.lua"]:48: in function <[string "lineno.lua"]:32>
 
=== modified file 'tests/suite/base/r/pooling.result'
--- tests/suite/base/r/pooling.result	2008-07-03 15:20:35 +0000
+++ tests/suite/base/r/pooling.result	2010-09-08 12:58:43 +0000
@@ -1,15 +1,18 @@
-SELECT counter;
+SELECT conn_id, stmt_id;
 conn_id	stmt_id
 2	1
-SELECT counter;
-conn_id	stmt_id
-1	1
-SELECT counter;
-conn_id	stmt_id
-1	2
-SELECT counter;
+SELECT conn_id, stmt_id;
 conn_id	stmt_id
 2	2
-SELECT counter;
+SELECT conn_id, stmt_id;
+conn_id	stmt_id
+3	1
+SELECT conn_id, stmt_id;
+conn_id	stmt_id
+2	3
+SELECT conn_id, stmt_id;
+conn_id	stmt_id
+4	1
+SELECT conn_id, stmt_id;
 conn_id	stmt_id
 5	1
 
=== modified file 'tests/suite/base/t/lineno.lua'
--- tests/suite/base/t/lineno.lua	2010-04-06 15:25:06 +0000
+++ tests/suite/base/t/lineno.lua	2010-09-08 12:58:43 +0000
@@ -1,5 +1,5 @@
 --[[ NEVER change the number of lines of this license header without also changing r/lineno.result. Thus we don't dynamically update the license header, either.
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010 Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -50,6 +50,19 @@
 
 			}
 		}
+	elseif packet:sub(2) == "SELECT current_backtrace_filename" then
+		proxy.response = {
+			type = proxy.MYSQLD_PACKET_OK,
+			resultset = {
+				fields = {
+					{ name = "filename", type = proxy.MYSQL_TYPE_STRING }
+				},
+				rows = { 
+					{ debug.getinfo(1, "S").short_src }
+				}
+
+			}
+		}
 	else
 		proxy.response = {
 			type = proxy.MYSQLD_PACKET_ERR,
 
=== modified file 'tests/suite/base/t/lineno.test'
--- tests/suite/base/t/lineno.test	2010-04-06 14:26:51 +0000
+++ tests/suite/base/t/lineno.test	2010-09-08 12:58:43 +0000
@@ -1,5 +1,5 @@
 #  $%BEGINLICENSE%$
-#  Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -17,4 +17,8 @@
 #  02110-1301  USA
 # 
 #  $%ENDLICENSE%$
+
+# fetch the Lua version of the current file-name  
+--let current_backtrace_filename = query_get_value("SELECT current_backtrace_filename", "filename", 1)
+--replace_result $current_backtrace_filename "[string \"lineno.lua\"]"
 SELECT backtrace;
 
=== modified file 'tests/suite/base/t/load_multi.test'
--- tests/suite/base/t/load_multi.test	2010-04-06 14:26:51 +0000
+++ tests/suite/base/t/load_multi.test	2010-09-08 12:58:43 +0000
@@ -1,5 +1,5 @@
 #  $%BEGINLICENSE%$
-#  Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -18,14 +18,14 @@
 # 
 #  $%ENDLICENSE%$
 --disable_query_log
---replace_result $srcdir <srcdir>
---eval pload $srcdir/base/t/lm2.lua
+--replace_result $abs_srcdir <srcdir>
+--eval pload $abs_srcdir/base/t/lm2.lua
 --enable_query_log
 connect (conn1,127.0.0.1,$MYSQL_USER,$MYSQL_PASSWORD,test,$PROXY_PORT,);
 select pload status;
 --disable_query_log
---replace_result $srcdir <srcdir>
---eval pload $srcdir/base/t/lm1.lua
+--replace_result $abs_srcdir <srcdir>
+--eval pload $abs_srcdir/base/t/lm1.lua
 --enable_query_log
 connection conn1;
 select 'first' as info;
@@ -44,13 +44,13 @@
 disconnect conn1;
 disconnect conn2;
 --disable_query_log
---replace_result $srcdir <srcdir>
---eval pload $srcdir/base/t/lm3.lua
+--replace_result $abs_srcdir <srcdir>
+--eval pload $abs_srcdir/base/t/lm3.lua
 --enable_query_log
 select 1000;
 --disable_query_log
---replace_result $srcdir <srcdir>
---eval punload $srcdir/base/t/lm3.lua
+--replace_result $abs_srcdir <srcdir>
+--eval punload $abs_srcdir/base/t/lm3.lua
 --enable_query_log
 select 1000;
 
 
=== modified file 'tests/suite/base/t/pooling-mock.lua'
--- tests/suite/base/t/pooling-mock.lua	2010-04-06 14:26:51 +0000
+++ tests/suite/base/t/pooling-mock.lua	2010-09-08 12:58:43 +0000
@@ -1,5 +1,5 @@
 --[[ $%BEGINLICENSE%$
- Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
@@ -23,24 +23,8 @@
 -- by comparing the statement-ids and the connection ids we can 
 -- track if the ro-pooling script was reusing a connection
 --
-function packet_auth(fields)
-	fields = fields or { }
-	return "\010" ..             -- proto version
-		(fields.version or "5.0.45-proxy") .. -- version
-		"\000" ..             -- term-null
-		"\001\000\000\000" .. -- thread-id
-		"\065\065\065\065" ..
-		"\065\065\065\065" .. -- challenge - part I
-		"\000" ..             -- filler
-		"\001\130" ..         -- server cap (long pass, 4.1 proto)
-		"\008" ..             -- charset
-		"\002\000" ..         -- status
-		("\000"):rep(13) ..   -- filler
-		"\065\065\065\065"..
-		"\065\065\065\065"..
-		"\065\065\065\065"..
-		"\000"                -- challenge - part II
-end
+
+local proto = require("mysql.proto")
 
 -- will be called once after connect
 stmt_id = 0
@@ -60,7 +44,7 @@
 	proxy.response = {
 		type = proxy.MYSQLD_PACKET_RAW,
 		packets = {
-			packet_auth()
+			proto.to_challenge_packet({})
 		}
 	}
 	return proxy.PROXY_SEND_RESULT
@@ -78,15 +62,15 @@
 	stmt_id = stmt_id + 1
 
 	local query = packet:sub(2) 
-	if query == 'SELECT counter' then
+	if query == 'SELECT conn_id, stmt_id' then
 		proxy.response = {
 			type = proxy.MYSQLD_PACKET_OK,
 			resultset = {
 				fields = {
-					{ name = 'conn_id' },
-					{ name = 'stmt_id' },
+					{ name = 'conn_id', type = proxy.MYSQLD_TYPE_INT },
+					{ name = 'stmt_id', type = proxy.MYSQLD_TYPE_INT },
 				},
-				rows = { { tostring(conn_id), tostring(stmt_id) } }
+				rows = { { conn_id, stmt_id } }
 			}
 		}
 	else
 
=== modified file 'tests/suite/base/t/pooling.test'
--- tests/suite/base/t/pooling.test	2010-04-06 14:26:51 +0000
+++ tests/suite/base/t/pooling.test	2010-09-08 12:58:43 +0000
@@ -1,5 +1,5 @@
 #  $%BEGINLICENSE%$
-#  Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -17,22 +17,30 @@
 #  02110-1301  USA
 # 
 #  $%ENDLICENSE%$
-connect (conn1,127.0.0.1,root,,,$PROXY_PORT); 
-SELECT counter;
+
+# open a few connections and test if they reuse connections that
+# end up in the pool
+
+connect (conn1,$PROXY_HOST,root,,,$PROXY_PORT); 
+SELECT conn_id, stmt_id;
 disconnect conn1;
 
-connect (conn2,127.0.0.1,root,,,$PROXY_PORT); 
-SELECT counter;
+connect (conn2,$PROXY_HOST,root,,,$PROXY_PORT); 
+SELECT conn_id, stmt_id;
 disconnect conn2;
 
-connect (conn3,127.0.0.1,root,,,$PROXY_PORT); 
-SELECT counter;
+connect (conn3,$PROXY_HOST,root,,,$PROXY_PORT); 
+SELECT conn_id, stmt_id;
 disconnect conn3;
 
-connect (conn4,127.0.0.1,root,,,$PROXY_PORT); 
-SELECT counter;
+connect (conn4,$PROXY_HOST,root,,,$PROXY_PORT); 
+SELECT conn_id, stmt_id;
 disconnect conn4;
 
-connect (conn5,127.0.0.1,root,,,$PROXY_PORT); 
-SELECT counter;
+connect (conn5,$PROXY_HOST,root,,,$PROXY_PORT); 
+SELECT conn_id, stmt_id;
 disconnect conn5;
+
+connect (conn6,$PROXY_HOST,root,,,$PROXY_PORT); 
+SELECT conn_id, stmt_id;
+disconnect conn6;
 
=== modified file 'tests/suite/run-tests.lua'
--- tests/suite/run-tests.lua	2010-05-05 10:46:53 +0000
+++ tests/suite/run-tests.lua	2010-09-08 12:58:43 +0000
@@ -30,46 +30,156 @@
 require("lfs")
 require("glib2")
 require("posix")
-
----
--- get the directory-name of a path
---
--- @param filename path to create the directory name from
-function dirname(filename)
-	local dirname = filename
-
-	attr = assert(lfs.attributes(dirname))
-
-	if attr.mode == "directory" then
-		return dirname
-	end
-
-	dirname = filename:gsub("/[^/]+$", "")
-	
-	attr = assert(lfs.attributes(dirname))
-
-	assert(attr.mode == "directory", "dirname("..filename..") failed: is ".. attr.mode)
-
-	return dirname
-end
-
----
--- get the file-name of a path
---
--- @param filename path to create the directory name from
-function basename(filename)
-	name = filename:gsub(".*/", "")
-	
-	return name
-end
+local fileutils = require("testenv.fileutils")
+local shellutils = require("testenv.shellutils")
+local testutils = require("testenv.testutils")
+local process   = require("testenv.process")
+local processmanager = require("testenv.processmanager")
 
 -- 
 -- a set of user variables which can be overwritten from the environment
 --
 
-local testdir = dirname(arg[0])
-
-local USE_POPEN		=	os.getenv('USE_POPEN') or 1
+TestRunner = {
+	num_tests   = 0,
+	num_passes  = 0,
+	num_skipped = 0,
+	num_fails   = 0,
+	failed_test = {},
+	tests       = {},
+
+	testenv = {
+	},
+
+	force_on_error = true,
+	tests_to_skip_filename = "tests_to_skip.lua",
+	tests_regex = os.getenv("TESTS_REGEX")
+}
+
+function TestRunner:new(o)
+	-- create a new process object
+	--
+	o = o or {}
+	setmetatable(o, self)
+	self.__index = self
+
+	local port_base = testutils.get_port_base(os.getenv("MYSQL_PROXY_START_PORT"), os.getenv("MYSQL_PROXY_END_PORT"))
+
+	self.testenv.testdir          = fileutils.dirname(arg[0])
+	self.testenv.srcdir	      = os.getenv("srcdir")		 	or self.testenv.testdir .. "/"
+	self.testenv.top_builddir     = os.getenv("top_builddir")   		or self.testenv.testdir .. "/../"
+	self.testenv.builddir         = os.getenv("builddir")	   	or self.testenv.testdir .. "/" -- same as srcdir by default
+	self.testenv.plugin_dir       = self.testenv.top_builddir .. "/plugins/"
+	self.testenv.basedir          = lfs.currentdir()
+	self.testenv.lua_path         = self.testenv.basedir .. "/" .. self.testenv.srcdir .. "/../../lib/?.lua"
+	self.testenv.lua_cpath        = self.testenv.basedir .. "/../../lib/.libs/?.so"
+
+	self.testenv.PROXY_HOST       = os.getenv("PROXY_HOST")		or "127.0.0.1"
+	self.testenv.PROXY_PORT       = os.getenv("PROXY_PORT")		or tostring(port_base + 0)
+	self.testenv.MYSQL_TEST_BIN   = os.getenv("MYSQL_TEST_BIN") 	or "mysqltest"
+	self.testenv.MYSQL_CLIENT_BIN = os.getenv("MYSQL_CLIENT_BIN")   or "mysql"
+	self.testenv.PROXY_CHAIN_PORT = os.getenv("PROXY_CHAIN_PORT")	or tostring(port_base + 30)
+
+	self.testenv.abs_srcdir	      = os.getenv("abs_srcdir")
+
+	if not self.testenv.abs_srcdir then
+		if not fileutils.path_is_absolute(self.testenv.srcdir) then
+			local abs_srcdir = posix.getcwd() .. "/" .. self.testenv.srcdir
+			self.testenv.abs_srcdir = abs_srcdir
+		else
+			self.testenv.abs_srcdir = self.testenv.srcdir
+		end
+		glib2.setenv("abs_srcdir", self.testenv.abs_srcdir) -- expose the abs_srcdir again as we run the proxy as --daemon which chdir()s to /
+	end
+
+	return o
+end
+
+function TestRunner:register_tests(suites)
+	for i, suite in ipairs(suites) do
+		local suite_srcdir = self.testenv.srcdir .. '/' .. suite
+		local suite_skipfile = suite_srcdir .. '/' .. self.tests_to_skip_filename
+		local stat = assert(lfs.attributes(suite_srcdir))
+
+		-- if it is a directory, execute all of them
+		if stat.mode == "directory" then
+			if fileutils.file_exists(suite_skipfile) then
+				assert(loadfile(suite_skipfile))()
+			end
+
+			for file in lfs.dir(suite_srcdir .. "/t/") do
+				local testname = file:match("(.+)\.test$")
+
+				if testname then
+					local is_skipped = false
+
+					if (self.tests_regex and not testname:match(self.tests_regex)) or tests_to_skip[testname] then
+						is_skipped = true
+					end
+
+					local test = MySQLProxyTest:new()
+					test.testname = testname
+					test.suite_srcdir = suite_srcdir
+					test.testenv = self.testenv
+					test.skipped = is_skipped
+
+					self.tests[#self.tests + 1] = test 
+				end
+			end
+		end
+	end
+end
+
+function TestRunner:run_all()
+	local exitcode = 0
+
+	for i, test in ipairs(self.tests) do
+		shellutils.print_verbose("# >> " .. test.testname .. " started")
+
+		self.num_tests = self.num_tests + 1
+		local r = test:run()
+		if (r == 0) then
+			self.num_passes = self.num_passes + 1
+		elseif (r == 77) then
+			self.num_skipped = self.num_skipped + 1
+		else
+			self.num_fails = self.num_fails + 1
+			table.insert(self.failed_test, test)
+		end
+
+		shellutils.print_verbose("# << (exitcode = " .. r .. ")" )
+
+		if r ~= 0 and r ~= 77 and exitcode == 0 then
+			exitcode = r
+		end
+
+		if self.num_fails > 0 and (not self.force_on_error) then
+			break
+		end
+	end
+
+	if self.num_fails > 0 then
+		print ("*** ERRORS OCCURRED - The following tests failed")
+		for i, test in pairs(self.failed_test) do
+			print(test.testname)
+		end
+	end
+
+	--
+	-- prints test suite statistics
+	shellutils.print_verbose (string.format('tests: %d - skipped: %d (%4.1f%%) - passed: %d (%4.1f%%) - failed: %d (%4.1f%%)',
+				self.num_tests,
+				self.num_skipped,
+				self.num_skipped / self.num_tests * 100,
+				self.num_passes,
+				self.num_passes / (self.num_tests - self.num_skipped) * 100,
+				self.num_fails,
+				self.num_fails / (self.num_tests  - self.num_skipped) * 100))
+	
+	return exitcode
+end
+
+
 
 local VERBOSE		= 	os.getenv('TEST_VERBOSE') or 
 						os.getenv('VERBOSE') or 
@@ -77,860 +187,318 @@
 VERBOSE = VERBOSE + 0
 
 local FORCE_ON_ERROR 	= os.getenv('FORCE_ON_ERROR') 	or os.getenv('FORCE')
+
+
 local MYSQL_USER	 	= os.getenv("MYSQL_USER")	 	or "root"
 local MYSQL_PASSWORD 	= os.getenv("MYSQL_PASSWORD") 	or ""
 local MYSQL_HOST	 	= os.getenv("MYSQL_HOST")	 	or "127.0.0.1"
 local MYSQL_PORT	 	= os.getenv("MYSQL_PORT")	 	or "3306"
 local MYSQL_DB	   		= os.getenv("MYSQL_DB")	   		or "test"
-local MYSQL_TEST_BIN 	= os.getenv("MYSQL_TEST_BIN") 	or "mysqltest"
-local MYSQL_CLIENT_BIN 	= os.getenv("MYSQL_CLIENT_BIN") or "mysql"
-local TESTS_REGEX 	= os.getenv("TESTS_REGEX")
-
---
--- Global variables that can be referenced from .options files
---
--- TODO : add HOST variables for MASTER, SLAVE, CHAIN
-function get_port_base() 
-	local port_base_start = os.getenv("MYSQL_PROXY_START_PORT") or 32768
-	local port_base_end   = os.getenv("MYSQL_PROXY_END_PORT") or 65535
-	local port_interval   = 64 -- let's take the base port in steps of ...
-	local range = port_base_end - port_base_start - port_interval
-	math.randomseed(posix.getpid())
-	local rand = math.floor(math.random() * (math.ceil(range / port_interval)))
-	local port_base = port_base_start + (rand * port_interval)
-
-	print(("... using tcp-port = %d as start port"):format(port_base))
-
-	return port_base
-end
-local port_base = get_port_base()
-
-PROXY_HOST	   = os.getenv("PROXY_HOST")		or "127.0.0.1"
-PROXY_PORT	   = os.getenv("PROXY_PORT")		or tostring(port_base + 0)
-PROXY_MASTER_PORT  = os.getenv("PROXY_MASTER_PORT")	or tostring(port_base + 10)
-PROXY_SLAVE_PORT   = os.getenv("PROXY_SLAVE_PORT")	or tostring(port_base + 20)
-PROXY_CHAIN_PORT   = os.getenv("PROXY_CHAIN_PORT")	or tostring(port_base + 30)
-ADMIN_PORT	   = os.getenv("ADMIN_PORT")		or tostring(port_base + 15)
-ADMIN_MASTER_PORT  = os.getenv("ADMIN_MASTER_PORT")	or tostring(port_base + 25)
-ADMIN_SLAVE_PORT   = os.getenv("ADMIN_SLAVE_PORT")	or tostring(port_base + 35)
-ADMIN_CHAIN_PORT   = os.getenv("ADMIN_CHAIN_PORT")	or tostring(port_base + 45)
-ADMIN_USER	   = os.getenv("ADMIN_USER")		or "root"
-ADMIN_PASSWORD	   = os.getenv("ADMIN_PASSWORD")	or ""
-ADMIN_DEFAULT_SCRIPT_FILENAME = os.getenv("ADMIN_DEFAULT_SCRIPT_FILENAME")	or ""
--- local PROXY_TMP_LUASCRIPT = os.getenv("PROXY_TMP_LUASCRIPT") or "/tmp/proxy.tmp.lua"
-
-local srcdir		 = os.getenv("srcdir")		 	or testdir .. "/"
-local top_builddir	 = os.getenv("top_builddir")   		or testdir .. "/../"
-local builddir	         = os.getenv("builddir")	   	or testdir .. "/" -- same as srcdir by default
-
-local PROXY_TRACE	= os.getenv("PROXY_TRACE")		or ""	-- use it to inject strace or valgrind
-local PROXY_PARAMS   = os.getenv("PROXY_PARAMS")   	or ""	-- extra params
-local PROXY_BINPATH  = os.getenv("PROXY_BINPATH")  	or top_builddir .. "/src/mysql-proxy"
-PROXY_LIBPATH  = os.getenv("PROXY_LIBPATH")  	or top_builddir .. "/plugins/"
-
-local COVERAGE_LCOV  = os.getenv("COVERAGE_LCOV")
+
 
 --
 -- end of user-vars
 --
 
-PROXY_PIDFILE		 	= lfs.currentdir() .. "/mysql-proxy-test.pid"
-PROXY_MASTER_PIDFILE  	= lfs.currentdir() .. "/mysql-proxy-test-master.pid"
-PROXY_SLAVE_PIDFILE   	= lfs.currentdir() .. "/mysql-proxy-test-slave.pid"
-PROXY_CHAIN_PIDFILE   	= lfs.currentdir() .. "/mysql-proxy-test-chain.pid"
-PROXY_BACKEND_PIDFILE 	= lfs.currentdir() .. "/mysql-proxy-test-backend.pid"
-PROXY_TEST_BASEDIR		= lfs.currentdir()
-
-DEFAULT_SCRIPT_FILENAME	 = "/tmp/dummy.lua"
-default_proxy_options = {
-	["proxy-backend-addresses"] = MYSQL_HOST .. ":" .. MYSQL_PORT,
-	["proxy-address"]		   	= PROXY_HOST .. ":" .. PROXY_PORT,
-	["admin-address"]		   	= PROXY_HOST .. ":" .. ADMIN_PORT,
-	["admin-username"]		   	= ADMIN_USER,
-	["admin-password"]		   	= ADMIN_PASSWORD,
-	["admin-lua-script"]			= ADMIN_DEFAULT_SCRIPT_FILENAME,
-	["pid-file"]				= PROXY_PIDFILE,
-	["proxy-lua-script"]		= DEFAULT_SCRIPT_FILENAME,
-	["plugin-dir"]			= PROXY_LIBPATH,
-	["basedir"]					= PROXY_TEST_BASEDIR,
-	}
-
-default_master_options = {
-	["proxy-backend-addresses"] = MYSQL_HOST .. ":" .. MYSQL_PORT,
-	["proxy-address"]		   	= PROXY_HOST .. ":" .. PROXY_MASTER_PORT,
-	["admin-address"]		   	= PROXY_HOST .. ":" .. ADMIN_MASTER_PORT,
-	["admin-username"]		   	= ADMIN_USER,
-	["admin-password"]		   	= ADMIN_PASSWORD,
-	["admin-lua-script"]			= ADMIN_DEFAULT_SCRIPT_FILENAME,
-	["pid-file"]				= PROXY_MASTER_PIDFILE,
-	["proxy-lua-script"]		= DEFAULT_SCRIPT_FILENAME,
-	["plugin-dir"]			= PROXY_LIBPATH,
-	["basedir"]					= PROXY_TEST_BASEDIR,
-	}
-
-default_slave_options = {
-	["proxy-backend-addresses"] = MYSQL_HOST .. ":" .. MYSQL_PORT,
-	["proxy-address"]		   	= PROXY_HOST .. ":" .. PROXY_SLAVE_PORT,
-	["admin-address"]		  	= PROXY_HOST .. ":" .. ADMIN_SLAVE_PORT,
-	["admin-username"]		   	= ADMIN_USER,
-	["admin-password"]		   	= ADMIN_PASSWORD,
-	["admin-lua-script"]			= ADMIN_DEFAULT_SCRIPT_FILENAME,
-	["pid-file"]				= PROXY_SLAVE_PIDFILE,
-	["proxy-lua-script"]		= DEFAULT_SCRIPT_FILENAME,
-	["plugin-dir"]			= PROXY_LIBPATH,
-	["basedir"]					= PROXY_TEST_BASEDIR,
-	}
-
-
-tests_to_skip = {}
-local tests_to_skip_filename = 'tests_to_skip.lua' 
-local proxy_list = {}
-default_proxy_name = 'default'
-
-local exitcode=0
-
----
--- print_verbose()
---
--- prints a message if either the DEBUG or VERBOSE variables
--- are set.
---
--- @param msg the message being printed
--- @param min_level the minimum verbosity level for printing the message (default 1)
-function print_verbose(msg, min_level)
-	min_level = min_level or 1
-	if (VERBOSE >= min_level) then
-		print (msg)
-	end
-end
----
--- check if the file exists and is readable 
-function file_exists(f)
-	return lfs.attributes(f)
-end
-
----
--- create the default option file
---
-function make_default_options_file(fname)
-	if file_exists(fname) then
-		return
-	end
-	local fd = assert(io.open(fname, "w"))
-	fd:write('start_proxy(default_proxy_name, default_proxy_options) \n')
-	fd:close();
-end
-
---- 
--- copy a file
---
--- @param dst filename of the destination
--- @param src filename of the source
-function file_copy(dst, src)
-	-- print_verbose("copying ".. src .. " to " .. dst)
-	local src_fd = assert(io.open(src, "rb"))
-	local content = src_fd:read("*a")
-	src_fd:close();
-
-	local dst_fd = assert(io.open(dst, "wb+"))
-	dst_fd:write(content);
-	dst_fd:close();
-end
-
----
--- create a empty file
---
--- if the file exists, it will be truncated to 0
---
--- @param dst filename to create and truncate
-function file_empty(dst)
-	-- print_verbose("emptying " .. dst)
-	local dst_fd = assert(io.open(dst, "wb+"))
-	dst_fd:close();
-end
-
----
--- turn a option-table into a string 
---
--- the values are encoded and quoted for the shell
---
--- @param tbl a option table
--- @param sep the seperator, defaults to a space
-function options_tostring(tbl, sep)
-	-- default value for sep 
-	sep = sep or " "
+-- options for the MySQL Proxy
+MySQLProxy = {
+}
+function MySQLProxy:new(o)
+	-- create a new process object
 	
-	assert(type(tbl) == "table")
-	assert(type(sep) == "string")
-
-	local s = ""
-	for k, v in pairs(tbl) do
-		local values
-		-- if the value is a table, repeat the option
-		if type(v) == "table" then
-			values = v
-		else
-			values = { v }
-		end
-
-		for tk, tv in pairs(values) do
-			local enc_value = tv:gsub("\\", "\\\\"):gsub("\"", "\\\"")
-			s = s .. "--" .. k .. "=\"" .. enc_value .. "\" "
-		end
-	end
-	-- print_verbose(" option: " .. s)
-
-	return s
-end
-
---- turns an option table into a string of environment variables
---
-function env_options_tostring(tbl)
-	assert(type(tbl) == "table")
-
-	local s = ""
-	for k, v in pairs(tbl) do
-		local enc_value = v:gsub("\\", "\\\\"):gsub("\"", "\\\"")
-		s = s .. k .. "=\"" .. enc_value .. "\" "
-	end
-
-	return s
-end
-
-
-function os_execute(cmdline)
-	print_verbose("$ " .. cmdline)
-	return os.execute(cmdline)
-end
-
----
--- get the PID from the pid file
---
-function get_pid(pid_file_name)
-	-- the file may exist, but the PID may not be written yet
-	local pid
-	local rounds = 0
-
-	repeat 
-		local fh = assert(io.open(pid_file_name, 'r'))
-		pid = fh:read("*n")
-		fh:close()
-		if not pid then
-			glib2.usleep(200 * 1000) -- wait a bit until we get some content
-			rounds = rounds + 1
-
-			if rounds > 10 then
-				error(("reading PID from existing pid-file '%s' failed after waiting 2 sec"):format(
-					pid_file_name))
+	o = o or {}
+	setmetatable(o, self)
+	self.__index = self
+
+	self.backends = { }
+	return o
+end
+
+function MySQLProxy:add_backend(addr)
+	self.backends[#self.backends + 1] = addr
+end
+
+function MySQLProxy:get_args(opts)
+	-- add a default backend 
+	if #self.backends == 0 then
+		self:add_backend(("%s:%d"):format(MYSQL_HOST, MYSQL_PORT))
+	end
+
+	opts = opts or { }
+	opts["plugin-dir"]   = self.testenv["plugin_dir"]
+	opts["basedir"]      = self.testenv["basedir"]
+	opts["pid-file"]     = opts["pid-file"] or ("%s/mysql-proxy.pid"):format(self.testenv.basedir)
+	opts["plugins"]      = "proxy"
+	opts["proxy-address"]= opts["proxy-address"] or ("%s:%d"):format(self.testenv.PROXY_HOST, self.testenv.PROXY_PORT)
+	self.proxy_address   = opts["proxy-address"]
+	opts["daemon"]       = true
+	opts["lua-path"]     = self.testenv.lua_path
+	opts["lua-cpath"]    = self.testenv.lua_cpath
+
+	opts["proxy-backend-addresses"] = self.backends
+
+	return opts
+end
+
+function MySQLProxy:get_env()
+	return {}
+end
+
+function MySQLProxy:get_command()
+	return os.getenv("PROXY_BINPATH") or self.testenv.top_builddir .. "/src/mysql-proxy"
+end
+
+---
+-- the backend
+MockBackend = MySQLProxy:new()
+function MockBackend:chain_with_frontend(frontend)
+	frontend:add_backend(self.proxy_address)
+end
+
+Test = {
+}
+
+function Test:new(o)
+	-- create a new process object
+	--
+	o = o or {}
+	setmetatable(o, self)
+	self.__index = self
+
+	self.skipped = false
+	self.testname = nil
+
+	return o
+end
+
+---
+-- @return true[, msg] if test should be skipped, false otherwise
+function Test:is_skipped()
+	return self.skipped
+end
+
+function Test:setup()
+	return true
+end
+
+function Test:teardown()
+	return true
+end
+
+function Test:run()
+	local is_skipped, skip_msg = self:is_skipped() 
+
+	if is_skipped then
+		print(('skip %s %s'):format(
+			self.testname,
+			skip_msg or 'no reason given'))
+		return 77
+	end
+
+	self.procs = processmanager:new()
+
+	local ret, errmsg = self:setup()
+	if not ret then
+		print(("err %s # setup failed: %s"):format(
+			self.testname,
+			errmsg))
+		ret = -1
+	else
+		ret = self:run_test()
+		self:teardown()
+	end
+
+	self.procs:shutdown_all() -- shutdown all the processes we started
+
+	return ret
+end
+
+---
+-- a Test baseclass that knows about 
+-- * mysqltest as test-driver
+-- * starting MySQL Proxies before starting mysqltest
+--
+-- inherited from Test
+MySQLProxyTest = Test:new()
+
+---
+-- 'test_self' is a hack to pass down the object we test right now to chain_proxy().
+--
+-- It is set in MySQLProxyTest:setup() 
+test_self = nil
+
+---
+-- setup the backend proxies and wire them together
+--
+-- depends on 'test_self' being a set to the currently running Test-object
+function chain_proxy(backend_filenames, script_filename)
+	local self = test_self
+
+	if type(backend_filenames) ~= "table" then
+		backend_filenames = { backend_filenames }
+	end
+
+	local backends = { }
+	for backend_ndx, backend_filename in ipairs(backend_filenames) do
+		local mock = MockBackend:new()
+		mock.testenv = self.testenv
+
+		local port = tonumber(self.testenv.PROXY_CHAIN_PORT) + backend_ndx - 1 -- we start with 1
+
+		local mock_args = mock:get_args({
+			["proxy-lua-script"] = ("%s/t/%s"):format(self.suite_srcdir, backend_filename),
+			["proxy-address"]    = ("%s:%d"):format(self.testenv.PROXY_HOST, port),
+			["pid-file"]         = ("%s/chain-%d.pid"):format(self.testenv.basedir, backend_ndx)
+		})
+
+		local proc  = process:new()
+		local ret = proc:execute(mock:get_command(),
+			mock:get_env(),
+			mock_args)
+		if ret ~= 0 then
+			return false, ""
+		end
+
+		if mock_args["pid-file"] then
+			local is_running, errmsg = proc:wait_running(mock_args["pid-file"])
+			if not is_running then
+				return false, errmsg or "not running"
 			end
 		end
-	until pid
-
-	-- the PID we get here should be a number
-	assert(type(pid) == "number")
-
-	return pid
-end
-
-function wait_proc_up(pid_file) 
-	local rounds = 0
-
-	while not file_exists(pid_file) do
-		glib2.usleep(200 * 1000) -- wait until the pid-file is created
-
-		rounds = rounds + 1
-		print_verbose(("(wait_proc_up) pid-wait: %d rounds, (%s)"):format(rounds, pid_file))
-
-		if rounds > 1000 then error(("proxy failed to start: no pid-file %s"):format(pid_file)) end
-	end
-
-	local pid = get_pid(pid_file)
-
-	rounds = 0
-	-- check that the process referenced in the PID-file is still up
-	while 0 ~= os.execute("kill -0 ".. pid .."  2> /dev/null") do
-		glib2.usleep(200 * 1000) -- wait until the pid-file is created
-		rounds = rounds + 1
-		print_verbose(("(wait_proc_up) kill-wait: %d rounds, pid=%d (%s)"):format(rounds, pid, pid_file))
-
-		if rounds > 5 then error(("proxy seems to have crashed: pid=%d (%s)"):format(pid, pid_file)) end
-	end
-end
-
-function proc_is_up(pid)
-	return os.execute("kill -0 ".. pid .."  2> /dev/null")
-end
-
-function proc_stop(pid)
-	return os.execute("kill -TERM ".. pid)
-end
-
-function wait_proc_down(pid_file) 
-	local rounds = 0
-	local pid = get_pid(pid_file)
-
-	-- wait until the proc in the pid file is dead
-	-- the shutdown takes at about 500ms
-	while 0 == proc_is_up(pid) do
-		glib2.usleep(200 * 1000) -- wait until process is gone
-		rounds = rounds + 1
-		print_verbose(("(wait_proc_down) kill-wait: %d rounds, pid=%d (%s)"):format(rounds, pid, pid_file))
-	end
-end
-
-function stop_proxy()
-	-- shut dowm the proxy
-	--
-	-- win32 has tasklist and taskkill on the shell
-	 
-	
-	-- shuts down every proxy in the proxy list
-	--
-	for proxy_name, proxy_options in pairs(proxy_list) do
-		local pid
-		pid_file = proxy_options['pid-file']
-		print_verbose ('stopping proxy ' .. proxy_name)
-		
-		pid = get_pid(pid_file)
-
-		if proc_is_up(pid) then
-			proc_stop(pid)
-		else
-			print("-- process "..proxy_name.." is already down")
-			exitcode = -1
-		end
-	end
-
-	-- wait until they are all gone
-	for proxy_name, proxy_options in pairs(proxy_list) do
-		pid_file = proxy_options['pid-file']
-
-		wait_proc_down(pid_file)
-
-		os.remove(pid_file)
-	end
-
-	--
-	-- empties the proxy list
-	--
-	proxy_list = { }
-end
-
-function only_item ( tbl, item)
-	local exists = false
-	for i,v in pairs(tbl) do
-		if i == item then
-			exists = true
-		else
-			return false
-		end
-	end
-	return exists
-end
-
----
--- before_test()
---
--- Executes a script with a base name like test_name and extension ".options"
---
--- If there is no such file, the default options are used
---
-function before_test(basedir, test_name)
-	local script_filename = basedir .. "/t/" .. test_name .. ".lua"
-	local options_filename = basedir .. "/t/" .. test_name .. ".options"
-	local has_option_file = file_exists(options_filename)
-	if file_exists( script_filename) then
-		if has_option_file then 
-			default_proxy_options['proxy-lua-script'] = script_filename
-			print_verbose('using lua script directly ' .. script_filename)
-			file_empty(DEFAULT_SCRIPT_FILENAME)
-		else
-			default_proxy_options['proxy-lua-script'] = DEFAULT_SCRIPT_FILENAME
-			file_copy(DEFAULT_SCRIPT_FILENAME, script_filename)
-			print_verbose('copying lua script to default ' .. script_filename)
-		end
-	else
-		default_proxy_options['proxy-lua-script'] = DEFAULT_SCRIPT_FILENAME
-		file_empty(DEFAULT_SCRIPT_FILENAME)
-		print_verbose('using empty lua script')
-	end
-	global_basedir = basedir
-	print_verbose ('current_dir ' ..  
-					basedir ..  
-					' - script: '  ..
-					default_proxy_options['proxy-lua-script']  )
-	-- 
-	-- executes the content of the options file
-	--
-	if has_option_file then
-		print_verbose('# using options file ' .. options_filename)
-		stop_proxy()
-	else
-		-- 
-		-- if no option file is found, the default options file is executed
-		--
-		options_filename = basedir .. "/t/default.options"
-		print_verbose('#using default options file' .. options_filename)
-		if only_item(proxy_list,'default') then
-			print_verbose('reusing existing proxy')
-			return
-		end
-		make_default_options_file(options_filename)
-	end
-	assert(loadfile(options_filename))()
-end
-
-function after_test()
-	if only_item(proxy_list, 'default') then
-		return
-	end
-	stop_proxy()
-end
-
-function alternative_execute (cmd)
-	print_verbose(cmd)
-
-	local fh = io.popen(cmd)
-	assert(fh, 'error executing '.. cmd)
-	local result = ''
-	local line = fh:read()
-	while line do
-		result = result .. line
-		line = fh:read()
-	end
-	fh:close()
-	return result
-end
-
-function conditional_execute (cmd)
-	if USE_POPEN then
-		return alternative_execute(cmd)
-	else
-		return os_execute(cmd)
-	end
-end
-
---- 
--- run a test
---
--- @param testname name of the test
--- @return exit-code of mysql-test
-function run_test(filename, basedir)
-	if not basedir then basedir = srcdir end
-
-	local testname = assert(filename:match("t/(.+)\.test"))
-	if tests_to_skip[testname] then
-		print('skip ' .. testname ..' '.. (tests_to_skip[testname] or 'no reason given') )
-		return 0, 1
-	end
-	before_test(basedir, testname)
-	if VERBOSE > 1 then		
-		os.execute('echo -n "' .. testname  .. ' " ; ' )
-	end
+
+		self.procs:add(proc)
+		table.insert(backends, mock)
+	end
+	-- all the backends are up, start the middle proxy
+
+	script_filename  = ("%s/t/%s"):format(self.suite_srcdir, script_filename)
+
+	local proxy = MySQLProxy:new()
+	proxy.testenv = self.testenv
+
+	for _, backend in ipairs(backends) do
+		backend:chain_with_frontend(proxy)
+	end
+
+	local proxy_args = proxy:get_args({
+		["proxy-lua-script"] = script_filename,
+	})
+
+	local proc  = process:new()
+	local ret = proc:execute(proxy:get_command(),
+		proxy:get_env(),
+		proxy_args)
+	if ret ~= 0 then
+		return false, ""
+	end
+	if proxy_args["pid-file"] then
+		local is_running, errmsg = proc:wait_running(proxy_args["pid-file"])
+		if not is_running then
+			return false, errmsg or "not running"
+		end
+	end
+
+	self.procs:add(proc)
+end
+
+function MySQLProxyTest:start_proxy(script_filename)
+	local proxy = MySQLProxy:new()
+	proxy.testenv = self.testenv
+	local proxy_args = proxy:get_args({
+		["proxy-lua-script"] = script_filename,
+	})
+
+	local proc  = process:new()
+	local ret = proc:execute(proxy:get_command(),
+		proxy:get_env(),
+		proxy_args)
+	if ret ~= 0 then
+		return false, ""
+	end
+	if proxy_args["pid-file"] then
+		local is_running, errmsg = proc:wait_running(proxy_args["pid-file"])
+		if not is_running then
+			return false, errmsg or "not running"
+		end
+	end
+
+	self.procs:add(proc)
+end
+
+function MySQLProxyTest:setup()
+	local script_filename  = ("%s/t/%s.lua"):format(self.suite_srcdir, self.testname)
+	local options_filename = ("%s/t/%s.options"):format(self.suite_srcdir, self.testname)
+	local has_script_file = fileutils.file_exists(script_filename)
+	local has_options_file = fileutils.file_exists(options_filename)
+
+	-- if we have a options file, run it as part of the setup phases
+	-- if not, assume that we want to start a proxy with the script_filename
+	if has_options_file then
+		-- load the options file
+		test_self = self -- expose 'self' so that chain_proxy() can use it
+		local setup_func, errmsg = loadfile(options_filename)
+		if not setup_func then
+			return false, errmsg
+		end
+
+		-- try to call the setup func
+		local ret, errmsg = pcall(setup_func)
+		if not ret then
+			return false, errmsg
+		end
+	else
+		self:start_proxy(script_filename)
+	end
+	return true
+end
+
+function MySQLProxyTest:run_test()
 	local result = 0
-	local ret = conditional_execute(
-		env_options_tostring({
-			['MYSQL_USER']  = MYSQL_USER,
-			['MYSQL_PASSWORD']  = MYSQL_PASSWORD,
-			['PROXY_HOST']  = PROXY_HOST,
-			['PROXY_PORT']  = PROXY_PORT,
-			['PROXY_CHAIN_PORT']  = PROXY_CHAIN_PORT,
-			['MASTER_PORT'] = PROXY_MASTER_PORT,
-			['SLAVE_PORT'] = PROXY_SLAVE_PORT,
-		}) .. ' ' ..
-		MYSQL_TEST_BIN .. " " ..
-		options_tostring({
-			user	 = MYSQL_USER,
-			password = MYSQL_PASSWORD,
-			database = MYSQL_DB,
-			host	 = PROXY_HOST,
-			port	 = PROXY_PORT,
+
+	local proc = process:new()
+	local ret = proc:popen(
+		self.testenv.MYSQL_TEST_BIN,
+		{
+			['MYSQL_USER']      = self.testenv.MYSQL_USER,
+			['MYSQL_PASSWORD']  = self.testenv.MYSQL_PASSWORD,
+			['PROXY_HOST']      = self.testenv.PROXY_HOST,
+			['PROXY_PORT']      = self.testenv.PROXY_PORT,
+			['PROXY_CHAIN_PORT']  = self.testenv.PROXY_CHAIN_PORT,
+			['MASTER_PORT']     = self.testenv.PROXY_MASTER_PORT,
+			['SLAVE_PORT']      = self.testenv.PROXY_SLAVE_PORT,
+		},
+		{
+			user	 = self.testenv.MYSQL_USER,
+			password = self.testenv.MYSQL_PASSWORD,
+			database = self.testenv.MYSQL_DB,
+			host	 = self.testenv.PROXY_HOST,
+			port	 = self.testenv.PROXY_PORT,
 			verbose  = (VERBOSE > 0) and "TRUE" or "FALSE", -- pass down the verbose setting 
-			["test-file"] = basedir .. "/t/" .. testname .. ".test",
-			["result-file"] = basedir .. "/r/" .. testname .. ".result",
-			["logdir"] = builddir, -- the .result dir might not be writable
+			["test-file"]   = self.suite_srcdir .. "/t/" .. self.testname .. ".test",
+			["result-file"] = self.suite_srcdir .. "/r/" .. self.testname .. ".result",
+			["logdir"]      = self.suite_builddir, -- the .result dir might not be writable
 		})
-	)
-	if USE_POPEN then
-		assert(ret == 'ok' or ret =='not ok', 'unexpected result <' .. ret .. '>')
-		if (ret == 'ok') then
-			result = 0
-		elseif ret == 'not ok'then
-			result = 1
-		end
-		print(ret .. ' ' .. testname)  
-	else
-		result = ret
-	end
-	after_test()	
-	return result, 0
-end
-
----
---sql_execute()
---
--- Executes a SQL query in a given Proxy
--- 
--- If no Proxy is indicated, the query is passed directly to the backend server
---
--- @param query A SQL statement to execute, or a table of SQL statements
--- @param proxy_name the name of the proxy that executes the query
-function sql_execute(queries, proxy_name)
-	local ret = 0
-	assert(type(queries) == 'string' or type(queries) == 'table', 'invalid type for query' )
-	if type(queries) == 'string' then
-		queries = {queries}
-	end
-	local query = ''
-	for i, q in pairs(queries) do
-		query = query .. ';' .. q
-	end
-
-	if proxy_name then  
-		-- 
-		-- a Proxy name is passed. 
-		-- The query is executed with the given proxy
-		local opts = proxy_list[proxy_name]
-		assert(opts,'proxy '.. proxy_name .. ' not active')
-		assert(opts['proxy-address'],'address for proxy '.. proxy_name .. ' not found')
-		local p_host, p_port = opts['proxy-address']:match('(%S+):(%S+)')
-		ret = os_execute( MYSQL_CLIENT_BIN .. ' ' ..
-			options_tostring({
-				user	 = MYSQL_USER,
-				password = MYSQL_PASSWORD,
-				database = MYSQL_DB,
-				host	 = p_host,
-				port	 = p_port,
-				execute  = query
-			})
-		)
-        assert(ret == 0, 'error using mysql client ')
-	else
-		--
-		-- No proxy name was passed.
-		-- The query is executed in the backend server
-		--
-		ret = os_execute( MYSQL_CLIENT_BIN .. ' ' ..
-			options_tostring({
-				user	 = MYSQL_USER,
-				password = MYSQL_PASSWORD,
-				database = MYSQL_DB,
-				host	 = PROXY_HOST,
-				port	 = MYSQL_PORT,
-				execute  = query
-			})
-		)
-	end
-	return ret
-end
-
-stop_proxy()
-
--- the proxy needs the lua-script to exist
--- file_empty(PROXY_TMP_LUASCRIPT)
-
--- if the pid-file is still pointing to a active process, kill it
---[[
-if file_exists(PROXY_PIDFILE) then
-	os.execute("kill -TERM `cat ".. PROXY_PIDFILE .." `")
-	os.remove(PROXY_PIDFILE)
-end
---]]
-
-if COVERAGE_LCOV then
-	-- os_execute(COVERAGE_LCOV .. 
-	--	" --zerocounters --directory ".. srcdir .. "/../src/" )
-end
-
--- setting the include path
---
-
--- this is the path containing the global Lua modules
-local GLOBAL_LUA_PATH = os.getenv('LUA_LDIR')  or '/usr/share/lua/5.1/?.lua'
-
--- this is the path containing the Proxy libraries 
-local PROXY_LUA_PATH = os.getenv('LUA_PATH')  or '/usr/local/share/?.lua'
-
--- This is the path with specific libraries for the test suite
-local PRIVATE_LUA_PATH = arg[1]  .. '/t/?.lua'  
-
--- This is the path with additional libraries that the user needs
-local LUA_USER_PATH = os.getenv('LUA_USER_PATH')  or '../lib/?.lua'
-
--- Building the final include path
-local INCLUDE_PATH = 
-		LUA_USER_PATH	 .. ';' ..
-		PRIVATE_LUA_PATH  .. ';' ..
-		GLOBAL_LUA_PATH   .. ';' .. 
-		PROXY_LUA_PATH 
-
----
--- start_proxy()
---
--- starts an instance of MySQL Proxy
---
--- @param proxy_name internal name of the proxy instance, for retrieval
--- @param proxy_options the options to start the Proxy
-function start_proxy(proxy_name, proxy_options)
-	-- start the proxy
-	assert(type(proxy_options) == 'table')
-	if not file_exists(proxy_options['proxy-lua-script']) then
-		proxy_options['proxy-lua-script'] = 
-			global_basedir .. 
-			'/t/' ..  proxy_options['proxy-lua-script'] 
-	end
-	print_verbose("starting " .. proxy_name .. " with " .. options_tostring(proxy_options))
-
-	-- remove the old pid-file if it exists
-	os.remove(proxy_options['pid-file'])
-	-- if we are supposed to listen on a UNIX socket, remove it first, because we don't clean it up on exit!
-	-- TODO: fix the code, instead of hacking around here! Bug#38415
-	if proxy_options['proxy-address'] == '/tmp/mysql-proxy-test.sock' then
-		os.remove(proxy_options['proxy-address'])
-	end
-	-- os.execute("head " .. proxy_options['proxy-lua-script'])
-	assert(os.execute( 'LUA_PATH="' .. INCLUDE_PATH  .. '"  ' ..
-		PROXY_TRACE .. " " .. PROXY_BINPATH .. " " ..
-		options_tostring( proxy_options) .. " &"
-	))
-
-	-- wait until the proxy is up
-	wait_proc_up(proxy_options['pid-file'])
-
-	proxy_list[proxy_name] = proxy_options 
-end
-
----
--- simulate_replication()
---
--- creates a fake master/slave by having two proxies
--- pointing at the same backend
---
--- you can alter those backends by changing 
--- the starting parameters
---
--- @param master_options options for master
--- @param slave_options options for slave
-function simulate_replication(master_options, slave_options)
-	if not master_options then
-		master_options = default_master_options
-	end
-	if not master_options['pid-file'] then
-		master_options['pid-file'] = PROXY_MASTER_PIDFILE
-	end
-	if not slave_options then
-		slave_options = default_slave_options
-	end
-	if not slave_options['pid-file'] then
-		slave_options['pid-file'] = PROXY_SLAVE_PIDFILE
-	end
-	start_proxy('master', master_options)
-	start_proxy('slave', slave_options)
-end
-
----
--- chain_proxy()
---
--- starts two proxy instances, with the first one is pointing to the 
--- default backend server, and the second one (with default ports)
--- is pointing at the first proxy
---
---   client -> proxy -> backend_proxy -> [ mysql-backend ]
---
--- usually we use it to mock a server with a lua script (...-mock.lua) and
--- the script under test in the proxy (...-test.lua)
---
--- in case you want to start several backend_proxies, just provide a array
--- as first param
---
--- @param backend_lua_script
--- @param second_lua_script 
--- @param use_replication uses a master proxy as backend 
-function chain_proxy (backend_lua_scripts, second_lua_script, use_replication)
-	local backends = { }
-
-	if type(backend_lua_scripts) == "table" then
-		backends = backend_lua_scripts
-	else
-		backends = { backend_lua_scripts }
-	end
-
-	local backend_addresses = { }
-
-	for i, backend_lua_script in ipairs(backends) do
-		backend_addresses[i] = PROXY_HOST .. ":" .. (PROXY_CHAIN_PORT + i - 1)
-
-		backend_proxy_options = {
-			["proxy-backend-addresses"] = MYSQL_HOST .. ":" .. MYSQL_PORT,
-			["proxy-address"]		   = backend_addresses[i],
-			["admin-address"]		   = PROXY_HOST .. ":" .. (ADMIN_CHAIN_PORT + i - 1),
-			["admin-username"]		   	= ADMIN_USER,
-			["admin-password"]		   	= ADMIN_PASSWORD,
-			["admin-lua-script"]		= ADMIN_DEFAULT_SCRIPT_FILENAME,
-			["pid-file"]				= PROXY_CHAIN_PIDFILE .. i,
-			["proxy-lua-script"]		= backend_lua_script or DEFAULT_SCRIPT_FILENAME,
-			["plugin-dir"]			= PROXY_LIBPATH,
-			["basedir"]					= PROXY_TEST_BASEDIR,
-			["log-level"]			= (VERBOSE == 4) and "debug" or "critical",
-		}
-		-- 
-		-- if replication was not started, then it is started here
-		--
-		if use_replication and (use_replication == true) then
-			if (proxy_list['master'] == nil) then
-				simulate_replication()
-			end
-			backend_proxy_options["proxy-backend-addresses"] = PROXY_HOST .. ':' .. PROXY_MASTER_PORT
-		end
-		start_proxy('backend_proxy' .. i, backend_proxy_options) 
-	end
-
-	second_proxy_options = {
-			["proxy-backend-addresses"] = backend_addresses ,
-			["proxy-address"]		   	= PROXY_HOST .. ":" .. PROXY_PORT,
-			["admin-address"]		   	= PROXY_HOST .. ":" .. ADMIN_PORT,
-			["admin-username"]		   	= ADMIN_USER,
-			["admin-password"]		   	= ADMIN_PASSWORD,
-			["admin-lua-script"]		= ADMIN_DEFAULT_SCRIPT_FILENAME,
-			["pid-file"]				= PROXY_PIDFILE,
-			["proxy-lua-script"]		= second_lua_script or DEFAULT_SCRIPT_FILENAME,
-			["plugin-dir"]			= PROXY_LIBPATH,
-			["basedir"]					= PROXY_TEST_BASEDIR,
-			["log-level"]			= (VERBOSE == 3) and "debug" or "critical",
-	}
-	start_proxy('second_proxy',second_proxy_options) 
-end
-
-local num_tests	 	= 0
-local num_passes	= 0
-local num_skipped   = 0
-local num_fails	 	= 0
-local all_ok		= true
-local failed_test   = {}
-
-file_empty(DEFAULT_SCRIPT_FILENAME)
-
---
--- if we have a argument, exectute the named test
--- otherwise execute all tests we can find
-if #arg then
-	for i, a in ipairs(arg) do
-		local stat = assert(lfs.attributes(a))
-
-		if file_exists(a .. '/' .. tests_to_skip_filename) then
-			assert(loadfile(a .. '/' .. tests_to_skip_filename))()
-		end
-
-		-- if it is a directory, execute all of them
-		if stat.mode == "directory" then
-			for file in lfs.dir(a .. "/t/") do
-				if not TESTS_REGEX or file:match(TESTS_REGEX) then
-					local testname = file:match("(.+\.test)$")
-			
-					if testname then
-						print_verbose("# >> " .. testname .. " started")
-			
-						num_tests = num_tests + 1
-						local r, skipped  = run_test("t/" .. testname, a)
-						if (r == 0) then
-							num_passes = num_passes + 1 - skipped
-						else
-							num_fails = num_fails + 1
-							all_ok = false
-							table.insert(failed_test, testname)
-						end
-						num_skipped = num_skipped + skipped
-
-						print_verbose("# << (exitcode = " .. r .. ")" )
-			
-						if r ~= 0 and exitcode == 0 then
-							exitcode = r
-						end
-					end
-					if all_ok == false and (not FORCE_ON_ERROR) then
-						break
-					end
-				end
-			end
-		else 
-			-- otherwise just this one test
-			--
-			-- FIXME: base/ is hard-coded for now
-			exitcode, skipped = run_test(a, "base/")
-			num_skipped = num_skipped + skipped
-		end
-	end
-else
-	for file in lfs.dir(srcdir .. "/t/") do
-		local testname = file:match("(.+\.test)$")
-
-		if testname then
-			print_verbose("# >> " .. testname .. " started")
-
-			num_tests = num_tests + 1
-			local r, skipped = run_test("t/" .. testname)
-			num_skipped = num_skipped + skipped
-			
-			print_verbose("# << (exitcode = " .. r .. ")" )
-			if (r == 0) then
-				num_passes = num_passes + 1 - skipped
-			else
-				all_ok = false
-				num_fails = num_fails + 1
-				table.insert(failed_test, testname)
-			end
-			if r ~= 0 and exitcode == 0 then
-				exitcode = r
-			end
-			if all_ok == false and (not FORCE_ON_ERROR) then
-				break
-			end
-		end
-	end
-end
-
-if all_ok ==false then
-	print ("*** ERRORS OCCURRED - The following tests failed")
-	for i,v in pairs(failed_test) do
-		print(v )
-	end
-end
-
---
--- prints test suite statistics
-print_verbose (string.format('tests: %d - skipped: %d (%4.1f%%) - passed: %d (%4.1f%%) - failed: %d (%4.1f%%)',
-			num_tests,
-			num_skipped,
-			num_skipped / num_tests * 100,
-			num_passes,
-			num_passes / (num_tests - num_skipped) * 100,
-			num_fails,
-			num_fails / (num_tests  - num_skipped) * 100))
-
---
--- stops any remaining active proxy
---
-stop_proxy()
-
-if COVERAGE_LCOV then
-	os_execute(COVERAGE_LCOV .. 
-		" --quiet " ..
-		" --capture --directory ".. srcdir .. "/../src/" ..
-		" > " .. srcdir .. "/../tests.coverage.info" )
-
-	os_execute("genhtml " .. 
-		"--show-details " ..
-		"--output-directory " .. srcdir .. "/../coverage/ " ..
-		"--keep-descriptions " ..
-		"--frames " ..
-		srcdir .. "/../tests.coverage.info")
-end
-
+
+	if (ret == "ok") then
+		print(("ok # %s"):format(self.testname))
+		return 0
+	elseif (ret == "not ok") then
+		print(("not ok # %s"):format(self.testname))
+		return -1
+	else 
+		print(("not ok # (%s) %s"):format(ret, self.testname))
+		return -1
+	end
+end
+
+local runner = TestRunner:new()
+runner:register_tests({"base"})
+local exitcode = runner:run_all()
 
 if exitcode == 0 then
 	os.exit(0)
 else
-	print_verbose("mysql-test exit-code: " .. exitcode)
+	shellutils.print_verbose("mysql-test exit-code: " .. exitcode)
 	os.exit(-1)
 end
 
 
=== added directory 'tests/suite/testenv'
=== added file 'tests/suite/testenv/Makefile.am'
--- tests/suite/testenv/Makefile.am	1970-01-01 00:00:00 +0000
+++ tests/suite/testenv/Makefile.am	2010-09-08 12:58:43 +0000
@@ -0,0 +1,7 @@
+EXTRA_DIST=\
+	fileutils.lua \
+	shellutils.lua \
+	testutils.lua \
+	process.lua \
+	processmanager.lua
+
 
=== added file 'tests/suite/testenv/fileutils.lua'
--- tests/suite/testenv/fileutils.lua	1970-01-01 00:00:00 +0000
+++ tests/suite/testenv/fileutils.lua	2010-09-08 12:58:43 +0000
@@ -0,0 +1,84 @@
+--[[ $%BEGINLICENSE%$
+ Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ --]]
+
+require("lfs")
+
+module("testenv.fileutils", package.seeall)
+
+---
+-- check if the file exists and is readable 
+function file_exists(f)
+	local r = lfs.attributes(f)
+	return (r ~= nil)
+end
+
+---
+-- check if a path is absolute 
+--
+-- FIXME: right now it is Unix only
+function path_is_absolute(f)
+	return f:byte() == "/"
+end
+
+---
+-- get the directory-name of a path
+--
+-- @param filename path to create the directory name from
+function dirname(filename)
+	local dirname = filename
+
+	attr = assert(lfs.attributes(dirname))
+
+	if attr.mode == "directory" then
+		return dirname
+	end
+
+	dirname = filename:gsub("/[^/]+$", "")
+	
+	attr = assert(lfs.attributes(dirname))
+
+	assert(attr.mode == "directory", "dirname("..filename..") failed: is ".. attr.mode)
+
+	return dirname
+end
+
+---
+-- get the file-name of a path
+--
+-- @param filename path to create the directory name from
+function basename(filename)
+	name = filename:gsub(".*/", "")
+	
+	return name
+end
+
+---
+-- create a empty file
+--
+-- if the file exists, it will be truncated to 0
+--
+-- @param dst filename to create and truncate
+function create_empty_file(dst)
+	-- print_verbose("emptying " .. dst)
+	local dst_fd = assert(io.open(dst, "wb+"))
+	dst_fd:close();
+end
+
+
 
=== added file 'tests/suite/testenv/process.lua'
--- tests/suite/testenv/process.lua	1970-01-01 00:00:00 +0000
+++ tests/suite/testenv/process.lua	2010-09-08 12:58:43 +0000
@@ -0,0 +1,179 @@
+--[[ $%BEGINLICENSE%$
+ Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ --]]
+
+local _G = _G
+
+local shellutils = require("testenv.shellutils")
+local glib2 = require("glib2")
+
+module("testenv.process")
+
+---
+-- life cycle management for processes
+--
+-- * PID files
+-- * wait until they are started
+-- * shutting down
+--
+function new(self, o)
+	-- create a new process object
+	--
+	o = o or {}
+	_G.setmetatable(o, self)
+	self.__index = self
+	return o
+end
+
+function get_pid(self)
+	return self.pid
+end
+
+function set_pid(self, pid)
+	self.pid = pid
+end
+
+---
+-- read a PID from a pidfile
+function set_pid_from_pidfile(self, pid_file_name)
+	local fh, errmsg = _G.io.open(pid_file_name, 'r')
+	if not fh then
+		return false, errmsg
+	end
+	local pid = fh:read("*n")
+	fh:close()
+
+	if _G.type(pid) ~= "number" then
+		return false
+	end
+	if not pid or pid == 0 then
+		return false
+	end
+
+	self:set_pid(pid)
+
+	return true
+end
+
+function is_running(self)
+	_G.assert(self.pid)
+
+	local ret = _G.os.execute("kill -0 ".. self.pid .."  2> /dev/null")
+
+	return (ret == 0)
+end
+
+---
+-- wait until the process is up and running
+--
+function wait_running(self, pid_file_name)
+	-- try to get a PID
+	local rounds = 0
+	local wait_interval_ms = 100
+
+	while not self.pid and rounds < 10 do
+		self:set_pid_from_pidfile(pid_file_name)
+		if self.pid then
+			break
+		end
+
+		glib2.usleep(wait_interval_ms * 1000) -- wait until process is gone
+		rounds = rounds + 1
+		shellutils.print_verbose(("process:wait_running(pid = %s) waited %dms"):format(pid_file_name, wait_interval_ms * rounds))
+	end
+
+	-- check if the process is actually alive
+	if not self.pid or not self:is_running() then
+		return false
+	end
+
+	return true
+end
+
+function wait_down(self)
+	_G.assert(self.pid)
+	local rounds = 0
+	local wait_interval_ms = 200
+
+	-- wait until the proc in the pid file is dead
+	-- the shutdown takes at about 500ms
+	while self:is_running() do
+		glib2.usleep(wait_interval_ms * 1000) -- wait until process is gone
+		rounds = rounds + 1
+		shellutils.print_verbose(("process:wait_down(pid = %d) waited %dms"):format(self.pid, wait_interval_ms * rounds))
+	end
+
+	return true
+end
+
+function shutdown(self)
+	-- shut down the proxy
+	--
+	-- win32 has tasklist and taskkill on the shell
+	if self.pid then
+		return _G.os.execute("kill -TERM ".. self.pid)
+	end
+end
+
+---
+-- execute a process 
+function execute(self, cmd, env, opts)
+	local env_str = ""
+	local opts_str = ""
+
+	if env then
+		env_str = shellutils.env_tostring(env)
+	end
+
+	if opts then
+		opts_str = shellutils.options_tostring(opts)
+	end
+
+	local cmdline = env_str .. " " .. cmd .. " " .. opts_str
+	shellutils.print_verbose("$ " .. cmdline)
+	return _G.os.execute(cmdline)
+end
+
+function popen(self, cmd, env, opts)
+	local env_str = ""
+	local opts_str = ""
+
+	if env then
+		env_str = shellutils.env_tostring(env)
+	end
+
+	if opts then
+		opts_str = shellutils.options_tostring(opts)
+	end
+
+	local cmdline = env_str .. " " .. cmd .. " " .. opts_str
+	shellutils.print_verbose("$ " .. cmdline)
+
+	local fh = _G.io.popen(cmdline)
+	_G.assert(fh, 'error executing '.. cmdline)
+	local result = ''
+	local line = fh:read()
+	while line do
+		result = result .. line
+		line = fh:read()
+	end
+	fh:close()
+	return result
+end
+
 
=== added file 'tests/suite/testenv/processmanager.lua'
--- tests/suite/testenv/processmanager.lua	1970-01-01 00:00:00 +0000
+++ tests/suite/testenv/processmanager.lua	2010-09-08 12:58:43 +0000
@@ -0,0 +1,72 @@
+--[[ $%BEGINLICENSE%$
+ Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ --]]
+
+---
+-- manage a set of processes
+--
+-- basicly, all we do is "add a process to the manager" and "shut them all down"
+--
+
+local _G = _G
+
+module("testenv.processmanager")
+
+---
+-- init a new manager
+--
+function new(self, o)
+	-- create a new processes object
+	--
+	o = o or {}
+	_G.setmetatable(o, self)
+	self.__index = self
+
+	self.processes = { }
+
+	return o
+end
+
+---
+-- add a process
+function add(self, proc)
+	_G.table.insert(self.processes, proc)
+end
+
+---
+-- stop all monitored processes
+--
+function shutdown_all(self)
+	-- shuts down every proxy in the proxy list
+	--
+	for proc_name, proc in _G.pairs(self.processes) do
+		if proc.pid then
+			proc:shutdown()
+		end
+	end
+
+	for proc_name, proc in _G.pairs(self.processes) do
+		if proc.pid then
+			proc:wait_down()
+		end
+		self.processes[proc_name] = nil
+	end
+end
+
+
 
=== added file 'tests/suite/testenv/shellutils.lua'
--- tests/suite/testenv/shellutils.lua	1970-01-01 00:00:00 +0000
+++ tests/suite/testenv/shellutils.lua	2010-09-08 12:58:43 +0000
@@ -0,0 +1,92 @@
+--[[ $%BEGINLICENSE%$
+ Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ --]]
+
+module("testenv.shellutils", package.seeall)
+
+VERBOSE = tonumber(os.getenv("VERBOSE")) or 0
+
+---
+-- turn a option-table into a string 
+--
+-- the values are encoded and quoted for the shell
+--
+-- @param tbl a option table
+-- @param sep the seperator, defaults to a space
+function options_tostring(tbl, sep) 
+	-- default value for sep 
+	sep = sep or " "
+	
+	assert(type(tbl) == "table")
+	assert(type(sep) == "string")
+
+	local s_tbl = { }
+	for k, v in pairs(tbl) do
+		local values
+		-- if the value is a table, repeat the option
+		if type(v) == "table" then
+			values = v
+		else
+			values = { v }
+		end
+
+		for tk, tv in pairs(values) do
+			if tv == true then
+				table.insert(s_tbl, "--" .. k)
+			else
+				local enc_value = tv:gsub("\\", "\\\\"):gsub("\"", "\\\"")
+				table.insert(s_tbl, "--" .. k .. "=\"" .. enc_value .. "\"")
+			end
+		end
+	end
+	local s = table.concat(s_tbl, " ")
+	-- print_verbose(" option: " .. s)
+
+	return s
+end
+
+--- turns an option table into a string of environment variables
+--
+function env_tostring(tbl)
+	assert(type(tbl) == "table")
+
+	local s = ""
+	for k, v in pairs(tbl) do
+		local enc_value = v:gsub("\\", "\\\\"):gsub("\"", "\\\"")
+		s = s .. k .. "=\"" .. enc_value .. "\" "
+	end
+
+	return s
+end
+
+---
+-- print_verbose()
+--
+-- prints a message if either the DEBUG or VERBOSE variables
+-- are set.
+--
+-- @param msg the message being printed
+-- @param min_level the minimum verbosity level for printing the message (default 1)
+function print_verbose(msg, min_level)
+	min_level = min_level or 1
+	if (VERBOSE >= min_level) then
+		print (msg)
+	end
+end
+
 
=== added file 'tests/suite/testenv/testutils.lua'
--- tests/suite/testenv/testutils.lua	1970-01-01 00:00:00 +0000
+++ tests/suite/testenv/testutils.lua	2010-09-08 12:58:43 +0000
@@ -0,0 +1,271 @@
+--[[ $%BEGINLICENSE%$
+ Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ --]]
+
+module("testenv.testutils", package.seeall)
+
+--
+-- Global variables that can be referenced from .options files
+--
+function get_port_base(port_base_start, port_base_end) 
+	local port_base_start = port_base_start or 32768
+	local port_base_end   = port_base_end or 65535
+	local port_interval   = 64 -- let's take the base port in steps of ...
+	local range = port_base_end - port_base_start - port_interval
+	math.randomseed(posix.getpid())
+	local rand = math.floor(math.random() * (math.ceil(range / port_interval)))
+	local port_base = port_base_start + (rand * port_interval)
+
+	print(("... using tcp-port = %d as start port"):format(port_base))
+
+	return port_base
+end
+
+
+-- setting the include path
+--
+
+-- this is the path containing the global Lua modules
+local GLOBAL_LUA_PATH = os.getenv('LUA_LDIR')  or '/usr/share/lua/5.1/?.lua'
+
+-- this is the path containing the Proxy libraries 
+local PROXY_LUA_PATH = os.getenv('LUA_PATH')  or '/usr/local/share/?.lua'
+
+-- This is the path with specific libraries for the test suite
+local PRIVATE_LUA_PATH = arg[1]  .. '/t/?.lua'  
+
+-- This is the path with additional libraries that the user needs
+local LUA_USER_PATH = os.getenv('LUA_USER_PATH')  or '../lib/?.lua'
+
+-- Building the final include path
+local INCLUDE_PATH = 
+		LUA_USER_PATH	 .. ';' ..
+		PRIVATE_LUA_PATH  .. ';' ..
+		GLOBAL_LUA_PATH   .. ';' .. 
+		PROXY_LUA_PATH 
+
+---
+-- start_proxy()
+--
+-- starts an instance of MySQL Proxy
+--
+-- @param proxy_name internal name of the proxy instance, for retrieval
+-- @param proxy_options the options to start the Proxy
+function start_proxy(proxy_name, proxy_options)
+	-- start the proxy
+	assert(type(proxy_options) == 'table')
+	if not file_exists(proxy_options['proxy-lua-script']) then
+		proxy_options['proxy-lua-script'] = 
+			global_basedir .. 
+			'/t/' ..  proxy_options['proxy-lua-script'] 
+	end
+	print_verbose("starting " .. proxy_name .. " with " .. options_tostring(proxy_options))
+
+	-- remove the old pid-file if it exists
+	os.remove(proxy_options['pid-file'])
+	-- if we are supposed to listen on a UNIX socket, remove it first, because we don't clean it up on exit!
+	-- TODO: fix the code, instead of hacking around here! Bug#38415
+	if proxy_options['proxy-address'] == '/tmp/mysql-proxy-test.sock' then
+		os.remove(proxy_options['proxy-address'])
+	end
+	-- os.execute("head " .. proxy_options['proxy-lua-script'])
+	assert(os.execute( 'LUA_PATH="' .. INCLUDE_PATH  .. '"  ' ..
+		PROXY_TRACE .. " " .. PROXY_BINPATH .. " " ..
+		options_tostring( proxy_options) .. " &"
+	))
+
+	-- wait until the proxy is up
+	proc = Process.new()
+	proc.set_pid_from_pidfile(proxy_options['pid-file'])
+
+	procs[proxy_name] = proc
+end
+
+---
+-- simulate_replication()
+--
+-- creates a fake master/slave by having two proxies
+-- pointing at the same backend
+--
+-- you can alter those backends by changing 
+-- the starting parameters
+--
+-- @param master_options options for master
+-- @param slave_options options for slave
+function simulate_replication(master_options, slave_options)
+	if not master_options then
+		master_options = default_master_options
+	end
+	if not master_options['pid-file'] then
+		master_options['pid-file'] = PROXY_MASTER_PIDFILE
+	end
+	if not slave_options then
+		slave_options = default_slave_options
+	end
+	if not slave_options['pid-file'] then
+		slave_options['pid-file'] = PROXY_SLAVE_PIDFILE
+	end
+	start_proxy('master', master_options)
+	start_proxy('slave', slave_options)
+end
+
+---
+-- chain_proxy()
+--
+-- starts two proxy instances, with the first one is pointing to the 
+-- default backend server, and the second one (with default ports)
+-- is pointing at the first proxy
+--
+--   client -> proxy -> backend_proxy -> [ mysql-backend ]
+--
+-- usually we use it to mock a server with a lua script (...-mock.lua) and
+-- the script under test in the proxy (...-test.lua)
+--
+-- in case you want to start several backend_proxies, just provide a array
+-- as first param
+--
+-- @param backend_lua_script
+-- @param second_lua_script 
+-- @param use_replication uses a master proxy as backend 
+function chain_proxy (backend_lua_scripts, second_lua_script, use_replication)
+	local backends = { }
+
+	if type(backend_lua_scripts) == "table" then
+		backends = backend_lua_scripts
+	else
+		backends = { backend_lua_scripts }
+	end
+
+	local backend_addresses = { }
+
+	for i, backend_lua_script in ipairs(backends) do
+		backend_addresses[i] = PROXY_HOST .. ":" .. (PROXY_CHAIN_PORT + i - 1)
+
+		backend_proxy_options = {
+			["proxy-backend-addresses"] = MYSQL_HOST .. ":" .. MYSQL_PORT,
+			["proxy-address"]		   = backend_addresses[i],
+			["admin-address"]		   = PROXY_HOST .. ":" .. (ADMIN_CHAIN_PORT + i - 1),
+			["admin-username"]		   	= ADMIN_USER,
+			["admin-password"]		   	= ADMIN_PASSWORD,
+			["admin-lua-script"]		= ADMIN_DEFAULT_SCRIPT_FILENAME,
+			["pid-file"]				= PROXY_CHAIN_PIDFILE .. i,
+			["proxy-lua-script"]		= backend_lua_script or DEFAULT_SCRIPT_FILENAME,
+			["plugin-dir"]			= PROXY_LIBPATH,
+			["basedir"]					= PROXY_TEST_BASEDIR,
+			["log-level"]			= (VERBOSE == 4) and "debug" or "critical",
+		}
+		-- 
+		-- if replication was not started, then it is started here
+		--
+		if use_replication and (use_replication == true) then
+			if (proxy_list['master'] == nil) then
+				simulate_replication()
+			end
+			backend_proxy_options["proxy-backend-addresses"] = PROXY_HOST .. ':' .. PROXY_MASTER_PORT
+		end
+		start_proxy('backend_proxy' .. i, backend_proxy_options) 
+	end
+
+	second_proxy_options = {
+			["proxy-backend-addresses"] = backend_addresses ,
+			["proxy-address"]		   	= PROXY_HOST .. ":" .. PROXY_PORT,
+			["admin-address"]		   	= PROXY_HOST .. ":" .. ADMIN_PORT,
+			["admin-username"]		   	= ADMIN_USER,
+			["admin-password"]		   	= ADMIN_PASSWORD,
+			["admin-lua-script"]		= ADMIN_DEFAULT_SCRIPT_FILENAME,
+			["pid-file"]				= PROXY_PIDFILE,
+			["proxy-lua-script"]		= second_lua_script or DEFAULT_SCRIPT_FILENAME,
+			["plugin-dir"]			= PROXY_LIBPATH,
+			["basedir"]					= PROXY_TEST_BASEDIR,
+			["log-level"]			= (VERBOSE == 3) and "debug" or "critical",
+	}
+	start_proxy('second_proxy',second_proxy_options) 
+end
+
+
+---
+--sql_execute()
+--
+-- Executes a SQL query in a given Proxy
+-- 
+-- If no Proxy is indicated, the query is passed directly to the backend server
+--
+-- @param query A SQL statement to execute, or a table of SQL statements
+-- @param proxy_name the name of the proxy that executes the query
+function sql_execute(queries, proxy_name)
+	local ret = 0
+	assert(type(queries) == 'string' or type(queries) == 'table', 'invalid type for query' )
+	if type(queries) == 'string' then
+		queries = {queries}
+	end
+	local query = ''
+	for i, q in pairs(queries) do
+		query = query .. ';' .. q
+	end
+
+	if proxy_name then  
+		-- 
+		-- a Proxy name is passed. 
+		-- The query is executed with the given proxy
+		local opts = proxy_list[proxy_name]
+		assert(opts,'proxy '.. proxy_name .. ' not active')
+		assert(opts['proxy-address'],'address for proxy '.. proxy_name .. ' not found')
+		local p_host, p_port = opts['proxy-address']:match('(%S+):(%S+)')
+		ret = os_execute( MYSQL_CLIENT_BIN .. ' ' ..
+			options_tostring({
+				user	 = MYSQL_USER,
+				password = MYSQL_PASSWORD,
+				database = MYSQL_DB,
+				host	 = p_host,
+				port	 = p_port,
+				execute  = query
+			})
+		)
+        assert(ret == 0, 'error using mysql client ')
+	else
+		--
+		-- No proxy name was passed.
+		-- The query is executed in the backend server
+		--
+		ret = os_execute( MYSQL_CLIENT_BIN .. ' ' ..
+			options_tostring({
+				user	 = MYSQL_USER,
+				password = MYSQL_PASSWORD,
+				database = MYSQL_DB,
+				host	 = PROXY_HOST,
+				port	 = MYSQL_PORT,
+				execute  = query
+			})
+		)
+	end
+	return ret
+end
+
+function only_item ( tbl, item)
+	local exists = false
+	for i,v in pairs(tbl) do
+		if i == item then
+			exists = true
+		else
+			return false
+		end
+	end
+	return exists
+end
+