tests: Improve test isolation

tests/Makefile.am

@@ -103,16 +103,16 @@ bench_log_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 bench_log_LDADD = $(top_builddir)/lib/libqb.la
 
 if HAVE_CHECK
-EXTRA_DIST += resources.test
+EXTRA_DIST += start.test resources.test
 EXTRA_DIST += blackbox-segfault.sh
 
-TESTS = array.test map.test rb.test log.test blackbox-segfault.sh loop.test ipc.test resources.test
+TESTS = start.test array.test map.test rb.test log.test blackbox-segfault.sh loop.test ipc.test resources.test
 
 resources.log: rb.log log.log ipc.log
 
 check_LTLIBRARIES =
 check_PROGRAMS = array.test map.test rb.test log.test loop.test ipc.test util.test crash_test_dummy file_change_bytes
-dist_check_SCRIPTS = resources.test blackbox-segfault.sh
+dist_check_SCRIPTS = start.test resources.test blackbox-segfault.sh
 
 if HAVE_SLOW_TESTS
 TESTS += util.test

tests/check_ipc.c

@@ -122,26 +122,19 @@ exit_handler(int32_t rsignal, void *data)
 static void
 set_ipc_name(const char *prefix)
 {
-	/* We have to make the server name as unique as possible given
-	 * the build- (seconds part of preprocessor's timestamp) and
-	 * run-time (pid + lower 16 bits of the current timestamp)
-	 * circumstances, because some build systems attempt to generate
-	 * packages for libqb in parallel.  These unit tests are run
-	 * during the package build process.  2+ builds executing on
-	 * the same machine (whether containerized or not because of
-	 * abstract unix sockets namespace sharing) can stomp on each
-	 * other's unit tests if the ipc server names aren't unique... */
-
-	/* single-shot grab of seconds part of preprocessor's timestamp */
-	static char t_sec[3] = "";
-	if (t_sec[0] == '\0') {
-		const char *const found = strrchr(__TIME__, ':');
-		strncpy(t_sec, found ? found + 1 : "-", sizeof(t_sec) - 1);
-		t_sec[sizeof(t_sec) - 1] = '\0';
+	FILE *f;
+	char process_name[256];
+
+	/* The process-unique part of the IPC name has already been decided
+	 * and stored in the file ipc-test-name.
+	 */
+	f= fopen("ipc-test-name", "r");
+	if (f) {
+		fgets(process_name, sizeof(process_name), f);
+		fclose(f);
 	}
 
-	snprintf(ipc_name, sizeof(ipc_name), "%s%s%lX%.4x", prefix, t_sec,
-		 (unsigned long)getpid(), (unsigned) ((long) time(NULL) % (0x10000)));
+	snprintf(ipc_name, sizeof(ipc_name), "%s%s", prefix, process_name);
 }
 
 static int32_t
@@ -1444,6 +1437,7 @@ START_TEST(test_ipcc_truncate_when_unlink_fails_shm)
 	test_ipc_server_fail();
 	_fi_unlink_inject_failure = QB_FALSE;
 	qb_leave();
+	unlink(sock_file);
 }
 END_TEST
 #endif

tests/resources.test

@@ -1,15 +1,16 @@
 #!/bin/sh
 RETURN=0
 
+IPC_NAME=`cat ipc-test-name`
 for d in /dev/shm /var/run; do
-	leftovers=$(find $d -name qb-test* -size +0c 2>/dev/null | wc -l)
+	leftovers=$(find $d -name qb-test*${IPC_NAME}* -size +0c 2>/dev/null | wc -l)
 	if [ "${leftovers}" -gt 0 ]; then
 		echo
 		echo "Error: shared memory segments not closed/unlinked"
 		echo
 		RETURN=1
 	fi
-	leftovers="$(find $d -name qb-test* -size 0c 2>/dev/null)"
+	leftovers="$(find $d -name qb-test*${IPC_NAME}* -size 0c 2>/dev/null)"
 	if [ "$(printf '%s\n' "${leftovers}" | wc -l)" -eq 6 ]; then
 		echo
 		echo "There were some empty leftovers (expected), removing them"

tests/start.test

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# Generate a unique(ish) name for the IPCs we will use in the tests and
+# save it in a file for all of the tests to use. This way we know for sure
+# which sockets are our and which we can ignore.
+# The test programs all add "qb-test-<name>-" to the front of this.
+#
+NAME="$$-`date +%N`"
+echo -n "$NAME" > ipc-test-name