passenger 5.0.4 → 5.0.5

data/test/cxx/TestSupport.h

@@ -1,333 +0,0 @@
-#ifndef _TEST_SUPPORT_H_
-#define _TEST_SUPPORT_H_
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <exception>
-#include <cstdio>
-#include <cerrno>
-#include <cstring>
-#include <ctime>
-#include <unistd.h>
-#include <utime.h>
-
-#include <oxt/thread.hpp>
-#include <oxt/tracable_exception.hpp>
-
-#include "../tut/tut.h"
-#include <ResourceLocator.h>
-#include <InstanceDirectory.h>
-#include <BackgroundEventLoop.h>
-#include <Exceptions.h>
-#include <Utils.h>
-#include <Utils/SystemTime.h>
-#include <Utils/json-forwards.h>
-
-extern "C" {
-	struct ev_loop;
-	struct ev_async;
-}
-
-namespace Passenger {
-	class SafeLibev;
-}
-
-namespace TestSupport {
-
-using namespace std;
-using namespace Passenger;
-using namespace oxt;
-
-
-#define SHOW_EXCEPTION_BACKTRACE(code)                                \
-	do {                                                          \
-		try {                                                 \
-			code                                          \
-		} catch (const tracable_exception &e) {               \
-			cerr << e.what() << "\n" << e.backtrace();    \
-			throw;                                        \
-		}                                                     \
-	} while (0)
-
-#define EVENTUALLY2(deadlineMsec, sleepTimeMsec, code)					\
-	do {										\
-		unsigned long long deadlineTime = SystemTime::getMsec(true) + deadlineMsec;	\
-		bool result = false;							\
-		while (!result && SystemTime::getMsec(true) < deadlineTime) {		\
-			{										\
-				code								\
-			}										\
-			if (!result) {							\
-				usleep(sleepTimeMsec * 1000);				\
-			}								\
-		}									\
-		if (!result) {								\
-			fail("EVENTUALLY(" #code ") failed");				\
-		}									\
-	} while (0)
-
-#define EVENTUALLY(deadlineSec, code) EVENTUALLY2(deadlineSec * 1000, 10, code)
-
-#define SHOULD_NEVER_HAPPEN(deadline, code)						\
-	do {										\
-		unsigned long long deadlineTime = SystemTime::getMsec(true) + deadline;	\
-		bool result = false;							\
-		while (!result && SystemTime::getMsec(true) < deadlineTime) {		\
-			code								\
-			if (!result) {							\
-				usleep(10000);						\
-			}								\
-		}									\
-		if (result) {								\
-			fail("SHOULD_NEVER_HAPPEN(" #code ") failed");			\
-		}									\
-	} while (0)
-
-// Do not run some tests in the Vagrant development environment because
-// they don't work over NFS.
-#define DONT_RUN_IN_VAGRANT() \
-	do { \
-		if (getenv("PASSENGER_VAGRANT_ENVIRONMENT") != NULL) { \
-			return; \
-		} \
-	} while (false)
-
-
-extern ResourceLocator *resourceLocator;
-extern Json::Value testConfig;
-
-
-/**
- * Create an instance directory with default parameters, suitable for unit testing.
- */
-void createInstanceDir(InstanceDirectoryPtr &instanceDir);
-
-void initializeLibeio();
-void shutdownLibeio();
-
-/**
- * Writes zeroes into the given file descriptor its buffer is full (i.e.
- * the next write will block).
- *
- * @throws SystemException
- */
-void writeUntilFull(int fd);
-
-/**
- * Look for 'toFind' inside the given file, replace it with 'replaceWith' and write
- * the result back to the file. Only the first occurence of 'toFind' is replaced.
- *
- * @throws FileSystemException
- */
-void replaceStringInFile(const char *filename, const string &toFind, const string &replaceWith);
-
-/**
- * Returns whether 'str' contains the given substring.
- */
-bool containsSubstring(const StaticString &str, const StaticString &substr);
-
-/**
- * Writes the given data into the given file.
- *
- * @throws FileSystemException
- */
-void writeFile(const string &filename, const string &contents);
-
-/**
- * Touch the given file: create the file if it doesn't exist, update its
- * timestamp if it does. If the <tt>timestamp</tt> argument is -1, then
- * the current system time will be used, otherwise the given timestamp
- * will be used.
- *
- * @throws FileSystemException
- */
-void touchFile(const char *filename, time_t timestamp = (time_t) - 1);
-
-/**
- * Returns all filenames in the given directory.
- */
-vector<string> listDir(const string &path);
-
-/**
- * Returns the name of the primary group of the given user.
- */
-string getPrimaryGroupName(const string &username);
-
-
-/**
- * Class which creates a temporary directory of the given name, and deletes
- * it upon destruction.
- */
-class TempDir {
-private:
-	string name;
-	bool ignoreRemoveErrors;
-public:
-	TempDir(const string &name, bool _ignoreRemoveErrors = false) {
-		this->name = name;
-		if (mkdir(name.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0 && errno != EEXIST) {
-			int e = errno;
-			string message = "Cannot create directory '";
-			message.append(name);
-			message.append("'");
-			throw FileSystemException(message, e, name);
-		}
-		ignoreRemoveErrors = _ignoreRemoveErrors;
-	}
-
-	~TempDir() {
-		if (ignoreRemoveErrors) {
-			try {
-				removeDirTree(name);
-			} catch (const RuntimeException &) {
-				// Do nothing.
-			}
-		} else {
-			removeDirTree(name);
-		}
-	}
-};
-
-
-/**
- * Creates a temporary copy of the given directory. This copy is deleted
- * upon object destruction.
- */
-class TempDirCopy {
-private:
-	string dir;
-public:
-	TempDirCopy(const string &source, const string &dest) {
-		dir = dest;
-		removeDirTree(dest);
-
-		char command[1024];
-		snprintf(command, sizeof(command), "cp -pR \"%s\" \"%s\"",
-			source.c_str(), dest.c_str());
-		pid_t pid = fork();
-		if (pid == 0) {
-			resetSignalHandlersAndMask();
-			disableMallocDebugging();
-			closeAllFileDescriptors(2);
-			execlp("/bin/sh", "/bin/sh", "-c", command, (char * const) 0);
-			_exit(1);
-		} else if (pid == -1) {
-			int e = errno;
-			throw SystemException("Cannot fork()", e);
-		} else {
-			waitpid(pid, NULL, 0);
-		}
-	}
-
-	~TempDirCopy() {
-		removeDirTree(dir);
-	}
-};
-
-
-/**
- * Class which deletes the given file upon destruction.
- */
-class DeleteFileEventually {
-private:
-	string filename;
-public:
-	DeleteFileEventually(const string &filename, bool deleteNow = true) {
-		this->filename = filename;
-		if (deleteNow) {
-			unlink(filename.c_str());
-		}
-	}
-
-	~DeleteFileEventually() {
-		unlink(filename.c_str());
-	}
-};
-
-
-/**
- * Spawns a thread which will be interrupted and joined when this TempThread
- * object is destroyed.
- */
-class TempThread {
-public:
-	oxt::thread thread;
-	bool joined;
-
-	TempThread(boost::function<void ()> func)
-		: thread(boost::bind(runAndPrintExceptions, func, true)),
-		  joined(false)
-		{ }
-
-	~TempThread() {
-		if (!joined) {
-			thread.interrupt_and_join();
-		}
-	}
-
-	void join() {
-		thread.join();
-		joined = true;
-	}
-};
-
-
-class AtomicInt {
-private:
-	mutable boost::mutex lock;
-	int val;
-public:
-	AtomicInt() {
-		val = 0;
-	}
-
-	AtomicInt(int value) {
-		val = value;
-	}
-
-	AtomicInt(const AtomicInt &other) {
-		val = other.val;
-	}
-
-	int get() const {
-		boost::lock_guard<boost::mutex> l(lock);
-		return val;
-	}
-
-	void set(int value) {
-		boost::lock_guard<boost::mutex> l(lock);
-		val = value;
-	}
-
-	AtomicInt &operator=(int value) {
-		set(value);
-		return *this;
-	}
-
-	AtomicInt &operator++() {
-		boost::lock_guard<boost::mutex> l(lock);
-		val++;
-		return *this;
-	}
-
-	AtomicInt operator++(int) {
-		boost::lock_guard<boost::mutex> l(lock);
-		AtomicInt temp(*this);
-		val++;
-		return temp;
-	}
-
-	operator int() const {
-		return get();
-	}
-};
-
-
-} // namespace TestSupport
-
-using namespace TestSupport;
-
-#endif /* _TEST_SUPPORT_H_ */

data/test/cxx/UnionStationTest.cpp

@@ -1,741 +0,0 @@
-#include <TestSupport.h>
-#include <UnionStation/Core.h>
-#include <UnionStation/Transaction.h>
-#include <MessageClient.h>
-#include <agents/LoggingAgent/LoggingServer.h>
-#include <Utils/MessageIO.h>
-
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-#include <oxt/thread.hpp>
-#include <set>
-
-using namespace Passenger;
-using namespace Passenger::UnionStation;
-using namespace std;
-using namespace oxt;
-
-namespace tut {
-	struct UnionStationTest {
-		static const unsigned long long YESTERDAY = 1263299017000000ull;  // January 12, 2009, 12:23:37 UTC
-		static const unsigned long long TODAY     = 1263385422000000ull;  // January 13, 2009, 12:23:42 UTC
-		static const unsigned long long TOMORROW  = 1263471822000000ull;  // January 14, 2009, 12:23:42 UTC
-		#define TODAY_TXN_ID "cjb8n-abcd"
-		#define TODAY_TIMESTAMP_STR "cftz90m3k0"
-
-		InstanceDirectoryPtr instanceDir;
-		string socketFilename;
-		string socketAddress;
-		string dumpFile;
-		AccountsDatabasePtr accountsDatabase;
-		ev::dynamic_loop eventLoop;
-		FileDescriptor serverFd;
-		LoggingServerPtr server;
-		boost::shared_ptr<oxt::thread> serverThread;
-		CorePtr core, core2, core3, core4;
-
-		UnionStationTest() {
-			createInstanceDir(instanceDir);
-			socketFilename = instanceDir->getPath() + "/logging.socket";
-			socketAddress = "unix:" + socketFilename;
-			dumpFile = instanceDir->getPath() + "/log.txt";
-			accountsDatabase = ptr(new AccountsDatabase());
-			accountsDatabase->add("test", "1234", false);
-			setLogLevel(LVL_ERROR);
-
-			startLoggingServer();
-			core = make_shared<Core>(socketAddress, "test", "1234",
-				"localhost");
-			core2 = make_shared<Core>(socketAddress, "test", "1234",
-				"localhost");
-			core3 = make_shared<Core>(socketAddress, "test", "1234",
-				"localhost");
-			core4 = make_shared<Core>(socketAddress, "test", "1234",
-				"localhost");
-		}
-
-		~UnionStationTest() {
-			stopLoggingServer();
-			SystemTime::releaseAll();
-			setLogLevel(DEFAULT_LOG_LEVEL);
-		}
-
-		void startLoggingServer(const boost::function<void ()> &initFunc = boost::function<void ()>()) {
-			VariantMap options;
-			options.set("analytics_dump_file", dumpFile);
-			serverFd = createUnixServer(socketFilename.c_str());
-			server = ptr(new LoggingServer(eventLoop,
-				serverFd, accountsDatabase, options));
-			if (initFunc) {
-				initFunc();
-			}
-			serverThread = ptr(new oxt::thread(
-				boost::bind(&UnionStationTest::runLoop, this)
-			));
-		}
-
-		void stopLoggingServer(bool destroy = true) {
-			if (serverThread != NULL) {
-				MessageClient client;
-				client.connect(socketAddress, "test", "1234");
-				client.write("exit", "immediately", NULL);
-				joinLoggingServer(destroy);
-			}
-		}
-
-		void joinLoggingServer(bool destroy = true) {
-			serverThread->join();
-			serverThread.reset();
-			if (destroy) {
-				server.reset();
-			}
-			unlink(socketFilename.c_str());
-		}
-
-		void runLoop() {
-			eventLoop.loop();
-			serverFd.close();
-		}
-
-		string timestampString(unsigned long long timestamp) {
-			char str[2 * sizeof(unsigned long long) + 1];
-			integerToHexatri<unsigned long long>(timestamp, str);
-			return str;
-		}
-
-		MessageClient createConnection(bool sendInitCommand = true) {
-			MessageClient client;
-			vector<string> args;
-			client.connect(socketAddress, "test", "1234");
-			if (sendInitCommand) {
-				client.write("init", "localhost", NULL);
-				client.read(args);
-			}
-			return client;
-		}
-
-		string readDumpFile() {
-			return readAll(dumpFile);
-		}
-	};
-
-	DEFINE_TEST_GROUP(UnionStationTest);
-
-
-	/*********** Logging interface tests ***********/
-
-	TEST_METHOD(1) {
-		// Test logging of new transaction.
-		SystemTime::forceAll(YESTERDAY);
-
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("hello");
-		log->message("world");
-		log->flushToDiskAfterClose(true);
-
-		ensure(!core->isNull());
-		ensure(!log->isNull());
-
-		log.reset();
-
-		string data = readDumpFile();
-		ensure(data.find("hello\n") != string::npos);
-		ensure(data.find("world\n") != string::npos);
-	}
-
-	TEST_METHOD(2) {
-		// Test logging of existing transaction.
-		SystemTime::forceAll(YESTERDAY);
-
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("message 1");
-		log->flushToDiskAfterClose(true);
-
-		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
-			log->getGroupName(), log->getCategory());
-		log2->message("message 2");
-		log2->flushToDiskAfterClose(true);
-
-		log.reset();
-		log2.reset();
-
-		string data = readDumpFile();
-		ensure("(1)", data.find("message 1\n") != string::npos);
-		ensure("(2)", data.find("message 2\n") != string::npos);
-	}
-
-	TEST_METHOD(3) {
-		// Test logging with different points in time.
-		SystemTime::forceAll(YESTERDAY);
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("message 1");
-		SystemTime::forceAll(TODAY);
-		log->message("message 2");
-		log->flushToDiskAfterClose(true);
-
-		SystemTime::forceAll(TOMORROW);
-		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
-			log->getGroupName(), log->getCategory());
-		log2->message("message 3");
-		log2->flushToDiskAfterClose(true);
-
-		TransactionPtr log3 = core3->newTransaction("foobar");
-		log3->message("message 4");
-		log3->flushToDiskAfterClose(true);
-
-		log.reset();
-		log2.reset();
-		log3.reset();
-
-		string data = readDumpFile();
-		ensure("(1)", data.find(timestampString(YESTERDAY) + " 1 message 1\n") != string::npos);
-		ensure("(2)", data.find(timestampString(TODAY) + " 2 message 2\n") != string::npos);
-		ensure("(3)", data.find(timestampString(TOMORROW) + " 4 message 3\n") != string::npos);
-		ensure("(4)", data.find(timestampString(TOMORROW) + " 1 message 4\n") != string::npos);
-	}
-
-	TEST_METHOD(4) {
-		// newTransaction() and continueTransaction() write an ATTACH message
-		// to the log file, while UnionStation::Transaction writes a DETACH message upon
-		// destruction.
-		SystemTime::forceAll(YESTERDAY);
-		TransactionPtr log = core->newTransaction("foobar");
-
-		SystemTime::forceAll(TODAY);
-		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
-			log->getGroupName(), log->getCategory());
-		log2->flushToDiskAfterClose(true);
-		log2.reset();
-
-		SystemTime::forceAll(TOMORROW);
-		log->flushToDiskAfterClose(true);
-		log.reset();
-
-		string data = readDumpFile();
-		ensure("(1)", data.find(timestampString(YESTERDAY) + " 0 ATTACH\n") != string::npos);
-		ensure("(2)", data.find(timestampString(TODAY) + " 1 ATTACH\n") != string::npos);
-		ensure("(3)", data.find(timestampString(TODAY) + " 2 DETACH\n") != string::npos);
-		ensure("(4)", data.find(timestampString(TOMORROW) + " 3 DETACH\n") != string::npos);
-	}
-
-	TEST_METHOD(5) {
-		// newTransaction() generates a new ID, while continueTransaction()
-		// reuses the ID.
-		TransactionPtr log = core->newTransaction("foobar");
-		TransactionPtr log2 = core2->newTransaction("foobar");
-		TransactionPtr log3 = core3->continueTransaction(log->getTxnId(),
-			log->getGroupName(), log->getCategory());
-		TransactionPtr log4 = core4->continueTransaction(log2->getTxnId(),
-			log2->getGroupName(), log2->getCategory());
-
-		ensure_equals(log->getTxnId(), log3->getTxnId());
-		ensure_equals(log2->getTxnId(), log4->getTxnId());
-		ensure(log->getTxnId() != log2->getTxnId());
-	}
-
-	TEST_METHOD(6) {
-		// An empty UnionStation::Transaction doesn't do anything.
-		UnionStation::Transaction log;
-		ensure(log.isNull());
-		log.message("hello world");
-		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
-	}
-
-	TEST_METHOD(7) {
-		// An empty UnionStation::Core doesn't do anything.
-		UnionStation::Core core;
-		ensure(core.isNull());
-
-		TransactionPtr log = core.newTransaction("foo");
-		ensure(log->isNull());
-		log->message("hello world");
-		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
-	}
-
-	TEST_METHOD(11) {
-		// newTransaction() does not reconnect to the server for a short
-		// period of time if connecting failed
-		core->setReconnectTimeout(60 * 1000000);
-
-		SystemTime::forceAll(TODAY);
-		stopLoggingServer();
-		ensure(core->newTransaction("foobar")->isNull());
-
-		SystemTime::forceAll(TODAY + 30 * 1000000);
-		startLoggingServer();
-		ensure(core->newTransaction("foobar")->isNull());
-
-		SystemTime::forceAll(TODAY + 61 * 1000000);
-		ensure(!core->newTransaction("foobar")->isNull());
-	}
-
-	TEST_METHOD(12) {
-		// If the logging server crashed and was restarted then
-		// newTransaction() and continueTransaction() print a warning and return
-		// a null log object. One of the next newTransaction()/continueTransaction()
-		// calls will reestablish the connection when the connection timeout
-		// has passed.
-		SystemTime::forceAll(TODAY);
-		TransactionPtr log, log2;
-
-		log = core->newTransaction("foobar");
-		core2->continueTransaction(log->getTxnId(), "foobar");
-		log.reset(); // Check connection back into the pool.
-		stopLoggingServer();
-		startLoggingServer();
-
-		log = core->newTransaction("foobar");
-		ensure("(1)", log->isNull());
-		log2 = core2->continueTransaction("some-id", "foobar");
-		ensure("(2)", log2->isNull());
-
-		SystemTime::forceAll(TODAY + 60000000);
-		log = core->newTransaction("foobar");
-		ensure("(3)", !log->isNull());
-		log2 = core2->continueTransaction(log->getTxnId(), "foobar");
-		ensure("(4)", !log2->isNull());
-		log2->message("hello");
-		log2->flushToDiskAfterClose(true);
-		log.reset();
-		log2.reset();
-
-		EVENTUALLY(3,
-			result = readDumpFile().find("hello\n") != string::npos;
-		);
-	}
-
-	TEST_METHOD(13) {
-		// continueTransaction() does not reconnect to the server for a short
-		// period of time if connecting failed
-		core->setReconnectTimeout(60 * 1000000);
-		core2->setReconnectTimeout(60 * 1000000);
-
-		SystemTime::forceAll(TODAY);
-		TransactionPtr log = core->newTransaction("foobar");
-		core2->continueTransaction(log->getTxnId(), "foobar");
-		stopLoggingServer();
-		ensure(core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
-
-		SystemTime::forceAll(TODAY + 30 * 1000000);
-		startLoggingServer();
-		ensure(core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
-
-		SystemTime::forceAll(TODAY + 61 * 1000000);
-		ensure(!core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
-	}
-
-	TEST_METHOD(14) {
-		// If a client disconnects from the logging server then all its
-		// transactions that are no longer referenced and have crash protection enabled
-		// will be closed and written to the sink.
-		MessageClient client1 = createConnection();
-		MessageClient client2 = createConnection();
-		MessageClient client3 = createConnection();
-		vector<string> args;
-
-		SystemTime::forceAll(TODAY);
-
-		client1.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "true", "true", NULL);
-		client1.read(args);
-		client2.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "true", NULL);
-		client2.write("log", TODAY_TXN_ID, "1000", NULL);
-		client2.writeScalar("hello world");
-		client2.write("flush", NULL);
-		client2.read(args);
-		client2.disconnect();
-		SHOULD_NEVER_HAPPEN(100,
-			// Transaction still has references open, so should not yet be written to sink.
-			result = readDumpFile().find("hello world") != string::npos;
-		);
-
-		client1.disconnect();
-		client3.write("flush", NULL);
-		client3.read(args);
-		EVENTUALLY(5,
-			result = readDumpFile().find("hello world") != string::npos;
-		);
-	}
-
-	TEST_METHOD(15) {
-		// If a client disconnects from the logging server then all its
-		// transactions that are no longer referenced and don't have crash
-		// protection enabled will be closed and discarded.
-		MessageClient client1 = createConnection();
-		MessageClient client2 = createConnection();
-		MessageClient client3 = createConnection();
-		vector<string> args;
-
-		SystemTime::forceAll(TODAY);
-
-		client1.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "false", "true", NULL);
-		client1.read(args);
-		client2.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "false", NULL);
-		client2.write("flush", NULL);
-		client2.read(args);
-		client2.disconnect();
-		client1.disconnect();
-		client3.write("flush", NULL);
-		client3.read(args);
-		SHOULD_NEVER_HAPPEN(500,
-			result = fileExists(dumpFile) && !readDumpFile().empty();
-		);
-	}
-
-	TEST_METHOD(16) {
-		// Upon server shutdown, all transaction that have crash protection enabled
-		// will be closed and written to to the sink.
-		MessageClient client1 = createConnection();
-		MessageClient client2 = createConnection();
-		vector<string> args;
-
-		SystemTime::forceAll(TODAY);
-
-		client1.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "true", "true", NULL);
-		client1.read(args);
-		client2.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "true", NULL);
-		client2.write("flush", NULL);
-		client2.read(args);
-
-		stopLoggingServer();
-		EVENTUALLY(5,
-			result = fileExists(dumpFile) && !readDumpFile().empty();
-		);
-	}
-
-	TEST_METHOD(17) {
-		// Upon server shutdown, all transaction that don't have crash protection
-		// enabled will be discarded.
-		MessageClient client1 = createConnection();
-		MessageClient client2 = createConnection();
-		vector<string> args;
-
-		SystemTime::forceAll(TODAY);
-
-		client1.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "false", "true", NULL);
-		client1.read(args);
-		client2.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"-", "false", NULL);
-		client2.write("flush", NULL);
-		client2.read(args);
-
-		stopLoggingServer();
-		SHOULD_NEVER_HAPPEN(200,
-			result = fileExists(dumpFile) && !readDumpFile().empty();
-		);
-	}
-
-	TEST_METHOD(18) {
-		// Test DataStoreId
-		{
-			// Empty construction.
-			DataStoreId id;
-			ensure_equals(id.getGroupName(), "");
-			ensure_equals(id.getNodeName(), "");
-			ensure_equals(id.getCategory(), "");
-		}
-		{
-			// Normal construction.
-			DataStoreId id("ab", "cd", "ef");
-			ensure_equals(id.getGroupName(), "ab");
-			ensure_equals(id.getNodeName(), "cd");
-			ensure_equals(id.getCategory(), "ef");
-		}
-		{
-			// Copy constructor.
-			DataStoreId id("ab", "cd", "ef");
-			DataStoreId id2(id);
-			ensure_equals(id2.getGroupName(), "ab");
-			ensure_equals(id2.getNodeName(), "cd");
-			ensure_equals(id2.getCategory(), "ef");
-		}
-		{
-			// Assignment operator.
-			DataStoreId id("ab", "cd", "ef");
-			DataStoreId id2;
-			id2 = id;
-			ensure_equals(id2.getGroupName(), "ab");
-			ensure_equals(id2.getNodeName(), "cd");
-			ensure_equals(id2.getCategory(), "ef");
-
-			DataStoreId id3("gh", "ij", "kl");
-			id3 = id;
-			ensure_equals(id3.getGroupName(), "ab");
-			ensure_equals(id3.getNodeName(), "cd");
-			ensure_equals(id3.getCategory(), "ef");
-		}
-		{
-			// < operator
-			DataStoreId id, id2;
-			ensure(!(id < id2));
-
-			id = DataStoreId("ab", "cd", "ef");
-			id2 = DataStoreId("ab", "cd", "ef");
-			ensure(!(id < id2));
-
-			id = DataStoreId("ab", "cd", "ef");
-			id2 = DataStoreId("bb", "cd", "ef");
-			ensure(id < id2);
-
-			id = DataStoreId("ab", "cd", "ef");
-			id2 = DataStoreId();
-			ensure(id2 < id);
-
-			id = DataStoreId();
-			id2 = DataStoreId("ab", "cd", "ef");
-			ensure(id < id2);
-		}
-		{
-			// == operator
-			ensure(DataStoreId() == DataStoreId());
-			ensure(DataStoreId("ab", "cd", "ef") == DataStoreId("ab", "cd", "ef"));
-			ensure(!(DataStoreId("ab", "cd", "ef") == DataStoreId()));
-			ensure(!(DataStoreId("ab", "cd", "ef") == DataStoreId("ab", "cd", "e")));
-			ensure(!(DataStoreId("ab", "cd", "ef") == DataStoreId("ab", "c", "ef")));
-			ensure(!(DataStoreId("ab", "cd", "ef") == DataStoreId("a", "cd", "ef")));
-		}
-	}
-
-	TEST_METHOD(22) {
-		// The destructor flushes all data.
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("hello world");
-		log.reset();
-		stopLoggingServer();
-
-		struct stat buf;
-		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
-		ensure(buf.st_size > 0);
-	}
-
-	TEST_METHOD(23) {
-		// The 'flush' command flushes all data.
-		SystemTime::forceAll(YESTERDAY);
-
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("hello world");
-		log.reset();
-
-		ConnectionPtr connection = core->checkoutConnection();
-		vector<string> args;
-		writeArrayMessage(connection->fd, "flush", NULL);
-		ensure(readArrayMessage(connection->fd, args));
-		ensure_equals(args.size(), 1u);
-		ensure_equals(args[0], "ok");
-
-		struct stat buf;
-		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
-		ensure(buf.st_size > 0);
-	}
-
-	TEST_METHOD(24) {
-		// A transaction's data is not written out by the server
-		// until the transaction is fully closed.
-		SystemTime::forceAll(YESTERDAY);
-		vector<string> args;
-
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("hello world");
-
-		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
-			log->getGroupName(), log->getCategory());
-		log2->message("message 2");
-		log2.reset();
-
-		ConnectionPtr connection = core->checkoutConnection();
-		writeArrayMessage(connection->fd, "flush", NULL);
-		ensure(readArrayMessage(connection->fd, args));
-
-		connection = core2->checkoutConnection();
-		writeArrayMessage(connection->fd, "flush", NULL);
-		ensure(readArrayMessage(connection->fd, args));
-
-		struct stat buf;
-		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
-		ensure_equals(buf.st_size, (off_t) 0);
-	}
-
-	TEST_METHOD(25) {
-		// The 'exit' command causes the logging server to exit some time after
-		// the last client has disconnected. New clients are still accepted
-		// as long as the server hasn't exited.
-		SystemTime::forceAll(YESTERDAY);
-		vector<string> args;
-
-		MessageClient client = createConnection();
-
-		MessageClient client2 = createConnection();
-		client2.write("exit", NULL);
-		ensure("(1)", client2.read(args));
-		ensure_equals(args.size(), 1u);
-		ensure_equals(args[0], "Passed security");
-		ensure("(2)", client2.read(args));
-		ensure_equals(args.size(), 1u);
-		ensure_equals(args[0], "exit command received");
-		client2.disconnect();
-
-		// Not exited yet: there is still a client.
-		client2 = createConnection();
-		client2.write("ping", NULL);
-		ensure("(3)", client2.read(args));
-		client2.disconnect();
-
-		client.disconnect();
-		setLogLevel(LVL_CRIT);
-		usleep(25000); // Give server some time to process the connection closes.
-
-		// No clients now, but we can still connect because the timeout
-		// hasn't passed yet.
-		SystemTime::forceAll(YESTERDAY + 1000000);
-		SHOULD_NEVER_HAPPEN(250,
-			try {
-				close(connectToUnixServer(socketFilename));
-				result = false;
-			} catch (const SystemException &) {
-				result = true;
-			}
-		);
-
-		usleep(50000); // Give server some time to process the connection closes.
-
-		// It'll be gone in a few seconds.
-		SystemTime::forceAll(YESTERDAY + 1000000 + 5000000);
-		usleep(100000); // Give server some time to run the timer.
-		try {
-			close(connectToUnixServer(socketFilename));
-			fail("(4)");
-		} catch (const SystemException &) {
-			// Success
-		}
-
-		joinLoggingServer();
-	}
-
-	TEST_METHOD(26) {
-		// The 'exit semi-gracefully' command causes the logging server to
-		// refuse new clients while exiting some time after the last client has
-		// disconnected.
-		SystemTime::forceAll(YESTERDAY);
-		vector<string> args;
-
-		MessageClient client = createConnection();
-
-		MessageClient client2 = createConnection();
-		client2.write("exit", "semi-gracefully", NULL);
-		client2.disconnect();
-
-		// New connections are refused.
-		client2 = createConnection();
-		ensure("(1)", !client2.read(args));
-
-		client.disconnect();
-		setLogLevel(LVL_CRIT);
-		usleep(50000); // Give server some time to process the connection closes.
-
-		// It'll be gone in a few seconds.
-		SystemTime::forceAll(YESTERDAY + 1000000 + 5000000);
-		usleep(100000); // Give server some time to run the timer.
-		try {
-			close(connectToUnixServer(socketFilename));
-			fail("(2)");
-		} catch (const SystemException &) {
-			// Success
-		}
-
-		joinLoggingServer();
-	}
-
-	TEST_METHOD(27) {
-		// The 'exit immediately' command causes the logging server to
-		// immediately exit. Open transactions are not automatically
-		// closed and written out, even those with crash protection
-		// turned on.
-		SystemTime::forceAll(YESTERDAY);
-
-		TransactionPtr log = core->newTransaction("foobar");
-		log->message("hello world");
-		log.reset();
-
-		MessageClient client = createConnection();
-		client.write("exit", "immediately", NULL);
-		client.disconnect();
-
-		// Assertion: the following doesn't block.
-		joinLoggingServer();
-	}
-
-	TEST_METHOD(28) {
-		// UnionStation::Core treats a server that's semi-gracefully exiting as
-		// one that's refusing connections.
-		SystemTime::forceAll(YESTERDAY);
-
-		MessageClient client = createConnection();
-		client.write("exit", "semi-gracefully", NULL);
-		client.disconnect();
-
-		TransactionPtr log = core->newTransaction("foobar");
-		ensure(log->isNull());
-	}
-
-	TEST_METHOD(29) {
-		// One can supply a custom node name per openTransaction command.
-		MessageClient client1 = createConnection();
-		vector<string> args;
-
-		SystemTime::forceAll(TODAY);
-
-		client1.write("openTransaction",
-			TODAY_TXN_ID, "foobar", "remote", "requests", TODAY_TIMESTAMP_STR,
-			"-", "true", NULL);
-		client1.write("closeTransaction", TODAY_TXN_ID, TODAY_TIMESTAMP_STR, NULL);
-		client1.write("flush", NULL);
-		client1.read(args);
-		client1.disconnect();
-
-		ensure(fileExists(dumpFile));
-	}
-
-	TEST_METHOD(30) {
-		// A transaction is only written to the sink if it passes all given filters.
-		// Test logging of new transaction.
-		SystemTime::forceAll(YESTERDAY);
-
-		TransactionPtr log = core->newTransaction("foobar", "requests", "-",
-			"uri == \"/foo\""
-			"\1"
-			"uri != \"/bar\"");
-		log->message("URI: /foo");
-		log->message("transaction 1");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-
-		log = core->newTransaction("foobar", "requests", "-",
-			"uri == \"/foo\""
-			"\1"
-			"uri == \"/bar\"");
-		log->message("URI: /foo");
-		log->message("transaction 2");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-
-		string data = readDumpFile();
-		ensure("(1)", data.find("transaction 1\n") != string::npos);
-		ensure("(2)", data.find("transaction 2\n") == string::npos);
-	}
-
-	/************************************/
-}