Skip to content
Snippets Groups Projects
Commit aad99e13 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

test: fix two failing tests

replication/cluster.test.py would fail at server exit, because
at_exit() handler tries to destroy a cbus while its mutex is locked.

args.test.py would fail when run with 'make test'
parent d988d7fb
No related branches found
No related tags found
No related merge requests found
......@@ -183,6 +183,12 @@ cbus_create(struct cbus *bus)
static void
cbus_destroy(struct cbus *bus)
{
/*
* Lock the mutex to ensure we do not destroy a mutex
* while it is locked, happens in at_exit() handler.
*/
(void) tt_pthread_mutex_lock(&bus->mutex);
(void) tt_pthread_mutex_unlock(&bus->mutex);
(void) tt_pthread_mutex_destroy(&bus->mutex);
(void) tt_pthread_cond_destroy(&bus->cond);
rmean_delete(bus->stats);
......
......@@ -9,6 +9,7 @@ server.test_option("-h")
# Replace with the same value for case when builddir inside source dir
sys.stdout.push_filter(re.escape(os.getenv("BUILDDIR")+'/src/tarantool'), "tarantool")
sys.stdout.push_filter(re.escape(os.getenv("BUILDDIR")), "${SOURCEDIR}")
sys.stdout.push_filter(re.escape(os.getenv("SOURCEDIR")+'/src/tarantool'), "tarantool")
sys.stdout.push_filter(re.escape(os.getenv("SOURCEDIR")), "${SOURCEDIR}")
sys.stdout.push_filter("invalid option.*", "invalid option")
sys.stdout.push_filter("unrecognized option.*", "unrecognized option")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment