passenger 4.0.60 → 5.0.0.beta1

data/packaging/debian/test

@@ -1,142 +0,0 @@
-#!/bin/bash
-set -e
-
-SELFDIR="`dirname \"$0\"`"
-SELFDIR="`cd \"$SELFDIR\" && pwd`"
-source "$SELFDIR/internal/lib/library.sh"
-source "$SELFDIR/internal/lib/distro_info.sh"
-
-PASSENGER_DIR=
-DISTRIBUTION=
-OUTPUT_DIR=
-CACHE_DIR=
-DEBUG_CONSOLE=false
-DEBUG_CONSOLE_ON_FAIL=false
-PASSENGER_ENTERPRISE_LICENSE_KEY=
-JENKINS=false
-
-function usage()
-{
-	echo "Usage: ./test [OPTIONS]"
-	echo "Test built packages."
-	echo
-	echo "Required options:"
-	echo "  -p DIR     Path to Passenger source code"
-	echo "  -x DISTRO  Distribution to run tests in. One of:"
-	echo "             $DEFAULT_DISTROS"
-	echo "  -d DIR     Path to built packages"
-	echo "  -c DIR     Path to cache directory"
-	echo
-	echo "Optional options:"
-	echo "  -O         Open debugging console instead of running test script"
-	echo "  -D         Open debugging console on test failure"
-	echo "  -e         Use the given Passenger Enterprise license key"
-	echo "  -j         Indicate that this script is run from a Jenkins job"
-	echo
-	echo "  -h         Show usage"
-}
-
-function parse_options()
-{
-	local OPTIND=1
-	local opt
-	while getopts "p:x:d:c:ODe:jh" opt; do
-		case "$opt" in
-		p)
-			PASSENGER_DIR="$OPTARG"
-			;;
-		x)
-			DISTRIBUTION="$OPTARG"
-			;;
-		d)
-			OUTPUT_DIR="$OPTARG"
-			;;
-		c)
-			CACHE_DIR="$OPTARG"
-			;;
-		O)
-			DEBUG_CONSOLE=true
-			;;
-		D)
-			DEBUG_CONSOLE_ON_FAIL=true
-			;;
-		e)
-			PASSENGER_ENTERPRISE_LICENSE_KEY="$OPTARG"
-			;;
-		j)
-			JENKINS=true
-			;;
-		h)
-			usage
-			exit
-			;;
-		*)
-			return 1
-			;;
-		esac
-	done
-
-	(( OPTIND -= 1 )) || true
-	shift $OPTIND || true
-
-	if [[ "$PASSENGER_DIR" = "" ]]; then
-		echo "ERROR: please specify a Passenger source directory with -p."
-		exit 1
-	fi
-	if [[ "$DISTRIBUTION" = "" ]]; then
-		echo "ERROR: please specify a distribution with -x."
-		exit 1
-	else
-		IMAGE=`to_testbox_image "$DISTRIBUTION"`
-	fi
-	if [[ "$OUTPUT_DIR" = "" ]]; then
-		echo "ERROR: please specify a build products directory with -d."
-		exit 1
-	fi
-	if [[ "$CACHE_DIR" = "" ]]; then
-		echo "ERROR: please specify a cache directory with -c."
-		exit 1
-	fi
-}
-
-parse_options "$@"
-PASSENGER_DIR="`absolute_path \"$PASSENGER_DIR\"`"
-OUTPUT_DIR="`absolute_path \"$OUTPUT_DIR\"`"
-CACHE_DIR="`absolute_path \"$CACHE_DIR\"`"
-
-EXTRA_ARGS=()
-if [[ "$PASSENGER_ENTERPRISE_LICENSE_KEY" != "" ]]; then
-	PASSENGER_ENTERPRISE_LICENSE_KEY="`absolute_path \"$PASSENGER_ENTERPRISE_LICENSE_KEY\"`"
-	EXTRA_ARGS+=(-v "$PASSENGER_ENTERPRISE_LICENSE_KEY:/etc/passenger-enterprise-license:ro")
-fi
-if tty -s; then
-	EXTRA_ARGS+=(-t -i)
-fi
-if [[ -e /sys/kernel/security/apparmor ]]; then
-	EXTRA_ARGS+=(--security-opt=apparmor:unconfined)
-fi
-
-run mkdir -p "$CACHE_DIR/test-$DISTRIBUTION/aptcache/archives/partial"
-run mkdir -p "$CACHE_DIR/test-$DISTRIBUTION/aptlist/partial"
-
-echo "-------- Entering Docker container --------"
-exec docker run \
-	--rm \
-	-v "$SELFDIR/internal:/system/internal:ro" \
-	-v "$PASSENGER_DIR:/passenger:ro" \
-	-v "$OUTPUT_DIR:/output:ro" \
-	-v "$CACHE_DIR:/cache" \
-	-v "$CACHE_DIR/test-$DISTRIBUTION/aptcache:/var/cache/apt" \
-	-v "$CACHE_DIR/test-$DISTRIBUTION/aptlist:/var/lib/apt/lists" \
-	"${EXTRA_ARGS[@]}" \
-	-e "DISTRIBUTION=$DISTRIBUTION" \
-	-e "DEBUG_CONSOLE=$DEBUG_CONSOLE" \
-	-e "DEBUG_CONSOLE_ON_FAIL=$DEBUG_CONSOLE_ON_FAIL" \
-	-e "JENKINS=$JENKINS" \
-	-e "APP_UID=`/usr/bin/id -u`" \
-	-e "APP_GID=`/usr/bin/id -g`" \
-	$IMAGE \
-	/system/internal/scripts/my_init --quiet --skip-runit --skip-startup-files -- \
-	/system/internal/scripts/inituidgid.sh \
-	/system/internal/test/misc/init.sh \
-	/system/internal/test/test.sh

data/packaging/rpm/passenger_spec/rubygem-passenger-4.0.18-gcc47-include-sys_types.patch

@@ -1,45 +0,0 @@
-diff -urp passenger-release-4.0.18.orig/ext/common/EventedMessageServer.h passenger-release-4.0.18/ext/common/EventedMessageServer.h
---- passenger-release-4.0.18.orig/ext/common/EventedMessageServer.h	2013-09-17 13:47:54.000000000 -0500
-+++ passenger-release-4.0.18/ext/common/EventedMessageServer.h	2013-09-23 13:59:23.012484647 -0500
-@@ -27,6 +27,7 @@
- 
- #include <boost/shared_ptr.hpp>
- #include <ev++.h>
-+#include <sys/types.h>
- #include <cstdarg>
- #include <cstdlib>
- #include <EventedServer.h>
-diff -urp passenger-release-4.0.18.orig/ext/common/FileDescriptor.h passenger-release-4.0.18/ext/common/FileDescriptor.h
---- passenger-release-4.0.18.orig/ext/common/FileDescriptor.h	2013-09-17 13:47:54.000000000 -0500
-+++ passenger-release-4.0.18/ext/common/FileDescriptor.h	2013-09-23 13:59:23.013484647 -0500
-@@ -30,6 +30,7 @@
- #include <oxt/system_calls.hpp>
- 
- #include <utility>
-+#include <sys/types.h>
- #include <unistd.h>
- #include <cerrno>
- 
-diff -urp passenger-release-4.0.18.orig/ext/common/Utils/BufferedIO.h passenger-release-4.0.18/ext/common/Utils/BufferedIO.h
---- passenger-release-4.0.18.orig/ext/common/Utils/BufferedIO.h	2013-09-17 13:47:54.000000000 -0500
-+++ passenger-release-4.0.18/ext/common/Utils/BufferedIO.h	2013-09-23 13:59:23.014484646 -0500
-@@ -1,6 +1,7 @@
- #ifndef _PASSENGER_BUFFERED_IO_H_
- #define _PASSENGER_BUFFERED_IO_H_
- 
-+#include <sys/types.h>
- #include <string>
- #include <utility>
- #include <algorithm>
-diff -urp passenger-release-4.0.18.orig/ext/common/Utils/StreamBoyerMooreHorspool.h passenger-release-4.0.18/ext/common/Utils/StreamBoyerMooreHorspool.h
---- passenger-release-4.0.18.orig/ext/common/Utils/StreamBoyerMooreHorspool.h	2013-09-17 13:47:54.000000000 -0500
-+++ passenger-release-4.0.18/ext/common/Utils/StreamBoyerMooreHorspool.h	2013-09-23 13:59:23.015484645 -0500
-@@ -189,7 +189,7 @@
- 	#endif
- #endif
- 
--
-+#include <sys/types.h>
- #include <cstddef>
- #include <cstring>
- #include <cassert>

data/test/cxx/Base64Test.cpp

@@ -1,50 +0,0 @@
-#include "TestSupport.h"
-#include "Utils/Base64.h"
-
-using namespace Passenger;
-using namespace std;
-
-namespace tut {
-	struct Base64Test {
-	};
-	
-	DEFINE_TEST_GROUP(Base64Test);
-
-	TEST_METHOD(1) {
-		// Test encoding.
-		ensure_equals(Base64::encode(""), "");
-		ensure_equals(Base64::encode("a"), "YQ==");
-		ensure_equals(Base64::encode("b"), "Yg==");
-		ensure_equals(Base64::encode("ab"), "YWI=");
-		ensure_equals(Base64::encode("abc"), "YWJj");
-		ensure_equals(Base64::encode("abcd"), "YWJjZA==");
-		ensure_equals(Base64::encode("\1\2\3\4\5\6\7\255"), "AQIDBAUGB60=");
-		ensure_equals(Base64::encode("The gamma-ray burst from April 23, a "
-			"powerful explosion from a dying star, was detected by the "
-			"Swift satellite using on-board gamma-ray and X-ray instruments."),
-			"VGhlIGdhbW1hLXJheSBidXJzdCBmcm9tIEFwcmlsIDIzLCBhIHBvd2VyZnVs"
-			"IGV4cGxvc2lvbiBmcm9tIGEgZHlpbmcgc3Rhciwgd2FzIGRldGVjdGVkIGJ5"
-			"IHRoZSBTd2lmdCBzYXRlbGxpdGUgdXNpbmcgb24tYm9hcmQgZ2FtbWEtcmF5"
-			"IGFuZCBYLXJheSBpbnN0cnVtZW50cy4=");
-		
-		ensure_equals(Base64::encodeForUrl("\003\340\177X"), "A-B_WA");
-	}
-	
-	TEST_METHOD(2) {
-		// Test decoding.
-		ensure_equals(Base64::decode(""), "");
-		ensure_equals(Base64::decode("YQ=="), "a");
-		ensure_equals(Base64::decode("Yg=="), "b");
-		ensure_equals(Base64::decode("YWI="), "ab");
-		ensure_equals(Base64::decode("YWJj"), "abc");
-		ensure_equals(Base64::decode("YWJjZA=="), "abcd");
-		ensure_equals(Base64::decode("AQIDBAUGB60="), "\1\2\3\4\5\6\7\255");
-		ensure_equals(Base64::decode("VGhlIGdhbW1hLXJheSBidXJzdCBmcm9tIEFwcmlsIDIzLCBhIHBvd2VyZnVs"
-			"IGV4cGxvc2lvbiBmcm9tIGEgZHlpbmcgc3Rhciwgd2FzIGRldGVjdGVkIGJ5"
-			"IHRoZSBTd2lmdCBzYXRlbGxpdGUgdXNpbmcgb24tYm9hcmQgZ2FtbWEtcmF5"
-			"IGFuZCBYLXJheSBpbnN0cnVtZW50cy4="),
-			"The gamma-ray burst from April 23, a "
-			"powerful explosion from a dying star, was detected by the "
-			"Swift satellite using on-board gamma-ray and X-ray instruments.");
-	}
-}

data/test/cxx/FileBackedPipeTest.cpp

@@ -1,626 +0,0 @@
-#include "TestSupport.h"
-#include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
-#include <agents/HelperAgent/FileBackedPipe.h>
-#include <algorithm>
-#include <pthread.h>
-
-using namespace Passenger;
-using namespace std;
-using namespace boost;
-
-namespace tut {
-	struct FileBackedPipeTest {
-		TempDir tmpdir;
-		BackgroundEventLoop bg;
-		FileBackedPipePtr pipe;
-
-		bool consumeImmediately;
-		size_t toConsume;
-		bool doneAfterConsuming;
-		bool resetOnData;
-		pthread_t consumeCallbackThread;
-		AtomicInt consumeCallbackCount;
-		string receivedData;
-		bool ended;
-		FileBackedPipe::ConsumeCallback consumedCallback;
-		AtomicInt commitCount;
-
-		FileBackedPipeTest()
-			: tmpdir("tmp.pipe", true) // Removing the directory may not work over NFS
-		{
-			consumeImmediately = true;
-			toConsume = 9999;
-			doneAfterConsuming = false;
-			resetOnData = false;
-			consumeCallbackCount = 0;
-			ended = false;
-			pipe = boost::make_shared<FileBackedPipe>("tmp.pipe");
-			pipe->userData = this;
-			pipe->onData = onData;
-			pipe->onEnd = onEnd;
-			pipe->onCommit = onCommit;
-		}
-		
-		~FileBackedPipeTest() {
-			bg.stop();
-			pipe.reset();
-		}
-
-		void init() {
-			pipe->reset(bg.safe);
-			bg.start();
-		}
-
-		bool write(const StaticString &data) {
-			bool result;
-			bg.safe->run(boost::bind(&FileBackedPipeTest::real_write, this, data, &result));
-			return result;
-		}
-
-		void real_write(StaticString data, bool *result) {
-			*result = pipe->write(data.data(), data.size());
-		}
-
-		unsigned int getBufferSize() {
-			unsigned int result;
-			bg.safe->run(boost::bind(&FileBackedPipeTest::real_getBufferSize, this, &result));
-			return result;
-		}
-
-		void real_getBufferSize(unsigned int *result) {
-			*result = pipe->getBufferSize();
-		}
-
-		void startPipe() {
-			bg.safe->run(boost::bind(&FileBackedPipe::start, pipe.get()));
-		}
-
-		void stopPipe() {
-			bg.safe->run(boost::bind(&FileBackedPipe::stop, pipe.get()));
-		}
-
-		void endPipe() {
-			bg.safe->run(boost::bind(&FileBackedPipe::end, pipe.get()));
-		}
-
-		void callConsumedCallback(size_t consumed, bool done) {
-			bg.safe->run(boost::bind(consumedCallback.toFunction(), consumed, done));
-		}
-
-		bool isStarted() {
-			bool result;
-			bg.safe->run(boost::bind(&FileBackedPipeTest::real_isStarted, this, &result));
-			return result;
-		}
-
-		void real_isStarted(bool *result) {
-			*result = pipe->isStarted();
-		}
-
-		bool reachedEnd() {
-			bool result;
-			bg.safe->run(boost::bind(&FileBackedPipeTest::real_reachedEnd, this, &result));
-			return result;
-		}
-
-		void real_reachedEnd(bool *result) {
-			*result = pipe->reachedEnd();
-		}
-
-		bool isCommittingToDisk() {
-			bool result;
-			bg.safe->run(boost::bind(&FileBackedPipeTest::real_isCommittingToDisk, this, &result));
-			return result;
-		}
-
-		void real_isCommittingToDisk(bool *result) {
-			*result = pipe->isCommittingToDisk();
-		}
-
-		FileBackedPipe::DataState getDataState() {
-			FileBackedPipe::DataState result;
-			bg.safe->run(boost::bind(&FileBackedPipeTest::real_getDataState, this, &result));
-			return result;
-		}
-
-		void real_getDataState(FileBackedPipe::DataState *result) {
-			*result = pipe->getDataState();
-		}
-
-		static void onData(const FileBackedPipePtr &source, const char *data,
-			size_t size, const FileBackedPipe::ConsumeCallback &consumed)
-		{
-			FileBackedPipeTest *self = (FileBackedPipeTest *) source->userData;
-			self->consumeCallbackThread = pthread_self();
-			if (!self->receivedData.empty()) {
-				self->receivedData.append("\n");
-			}
-			self->receivedData.append(data, size);
-			self->consumeCallbackCount++;
-			if (self->resetOnData) {
-				source->reset();
-			}
-			if (self->consumeImmediately) {
-				consumed(std::min(self->toConsume, size), self->doneAfterConsuming);
-			} else {
-				self->consumedCallback = consumed;
-			}
-		}
-
-		static void onEnd(const FileBackedPipePtr &source) {
-			FileBackedPipeTest *self = (FileBackedPipeTest *) source->userData;
-			self->ended = true;
-		}
-
-		static void onCommit(const FileBackedPipePtr &source) {
-			FileBackedPipeTest *self = (FileBackedPipeTest *) source->userData;
-			self->commitCount++;
-		}
-	};
-
-	DEFINE_TEST_GROUP(FileBackedPipeTest);
-
-	TEST_METHOD(1) {
-		// Test writing to an empty, started pipe and consuming all data immediately.
-		init();
-		startPipe();
-		ensure("immediately consumed", write("hello"));
-		ensure("callback called from event loop thread",
-			pthread_equal(consumeCallbackThread, bg.safe->getCurrentThread()));
-		ensure_equals(receivedData, "hello");
-		ensure_equals("nothing buffered", getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-	}
-
-	TEST_METHOD(2) {
-		// Test writing to an empty, started pipe and not consuming immediately.
-		init();
-		startPipe();
-		consumeImmediately = false;
-		write("hello");
-		ensure_equals(receivedData, "hello");
-		ensure_equals("everything buffered", getBufferSize(), sizeof("hello") - 1);
-
-		receivedData.clear();
-		callConsumedCallback(5, false);
-		ensure_equals(getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-	}
-
-	TEST_METHOD(3) {
-		// Test writing to an empty, stopped pipe and starting it later.
-		init();
-		write("hello");
-		startPipe();
-		ensure_equals(consumeCallbackCount, 1);
-		ensure_equals(receivedData, "hello");
-		ensure_equals(getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-	}
-
-	TEST_METHOD(4) {
-		// When the consume callback is called with done=false, the pipe should be paused.
-		init();
-		startPipe();
-		doneAfterConsuming = true;
-		write("hello");
-		ensure(!isStarted());
-		ensure_equals(getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-	}
-
-	TEST_METHOD(5) {
-		// After consuming some data, if the pipe is still in started mode then
-		// it should emit any remaining data.
-		init();
-		startPipe();
-		toConsume = 3;
-		write("hello");
-		ensure_equals(getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-		ensure_equals(receivedData,
-			"hello\n"
-			"lo");
-		ensure_equals(consumeCallbackCount, 2);
-	}
-
-	TEST_METHOD(6) {
-		// Writing to a stopped pipe will cause the data to be buffered.
-		// This buffer will be passed to the data callback when we
-		// start the pipe again. If the data callback doesn't consume
-		// everything at once then the pipe will try again until
-		// everything's consumed.
-		init();
-		toConsume = 3;
-		write("hello");
-		ensure_equals(getBufferSize(), 5u);
-		ensure("not committing to disk", !isCommittingToDisk());
-		ensure_equals(receivedData, "");
-		ensure_equals(consumeCallbackCount, 0);
-		startPipe();
-		ensure_equals(getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-		ensure_equals(consumeCallbackCount, 2);
-		ensure_equals(receivedData,
-			"hello\n"
-			"lo");
-	}
-
-	TEST_METHOD(7) {
-		// Test writing to a pipe whose consume callback hasn't
-		// been called yet and whose data state is IN_MEMORY.
-		init();
-		startPipe();
-		consumeImmediately = false;
-		write("hello");
-
-		write("world");
-		ensure_equals(getDataState(), FileBackedPipe::IN_MEMORY);
-		ensure_equals(getBufferSize(), 10u);
-		ensure("not committing to disk", !isCommittingToDisk());
-		ensure_equals(consumeCallbackCount, 1);
-		ensure_equals(receivedData, "hello");
-
-		callConsumedCallback(4, false);
-		ensure_equals(getBufferSize(), 6u);
-		ensure("not committing to disk", !isCommittingToDisk());
-		ensure_equals(consumeCallbackCount, 2);
-		ensure_equals(receivedData,
-			"hello\n"
-			"oworld");
-		
-		callConsumedCallback(6, false);
-		ensure_equals(getBufferSize(), 0u);
-		ensure("not committing to disk", !isCommittingToDisk());
-		ensure_equals(consumeCallbackCount, 2);
-		ensure_equals(receivedData,
-			"hello\n"
-			"oworld");
-	}
-
-	TEST_METHOD(8) {
-		// Test writing to a pipe whose consume callback hasn't
-		// been called yet and whose data state is OPENING_FILE.
-		pipe->setThreshold(3);
-		pipe->openTimeout = 30;
-		init();
-		startPipe();
-		consumeImmediately = false;
-		write("hello");
-
-		write("world");
-		ensure_equals("(1)", getDataState(), FileBackedPipe::OPENING_FILE);
-		ensure_equals("(2)", getBufferSize(), 10u);
-		ensure("committing to disk", isCommittingToDisk());
-		ensure_equals("(3)", consumeCallbackCount, 1);
-		ensure_equals("(4)", receivedData, "hello");
-
-		callConsumedCallback(4, false);
-		ensure_equals("(5)", getDataState(), FileBackedPipe::OPENING_FILE);
-		ensure_equals("(6)", getBufferSize(), 6u);
-		ensure_equals("(7)", consumeCallbackCount, 2);
-		ensure_equals("(8)", receivedData,
-			"hello\n"
-			"oworld");
-		
-		callConsumedCallback(6, false);
-		ensure_equals("(9)", getDataState(), FileBackedPipe::OPENING_FILE);
-		ensure_equals("(10)", getBufferSize(), 0u);
-		ensure_equals("(11)", consumeCallbackCount, 2);
-		ensure_equals("(12)", receivedData,
-			"hello\n"
-			"oworld");
-	}
-
-	TEST_METHOD(9) {
-		// Test writing to a pipe whose consume callback hasn't
-		// been called yet and whose data state is IN_FILE.
-		pipe->setThreshold(3);
-		init();
-		startPipe();
-		consumeImmediately = false;
-		write("hello");
-
-		write("world");
-		EVENTUALLY(5,
-			result = getDataState() == FileBackedPipe::IN_FILE && consumeCallbackCount == 1;
-		);
-		ensure_equals("(2)", getBufferSize(), 10u);
-		ensure_equals("(3)", receivedData, "hello");
-
-		callConsumedCallback(4, false);
-		EVENTUALLY(5,
-			result = consumeCallbackCount == 2;
-		);
-		ensure_equals("(4)", getDataState(), FileBackedPipe::IN_FILE);
-		ensure_equals("(5)", getBufferSize(), 6u);
-		ensure_equals("(7)", receivedData,
-			"hello\n"
-			"oworld");
-		
-		callConsumedCallback(6, false);
-		ensure_equals("(8)", getDataState(), FileBackedPipe::IN_FILE);
-		ensure_equals("(9)", getBufferSize(), 0u);
-		ensure_equals("(10)", consumeCallbackCount, 2);
-		ensure_equals("(11)", receivedData,
-			"hello\n"
-			"oworld");
-	}
-
-	TEST_METHOD(10) {
-		// When the data doesn't fit in the memory buffer it will
-		// write to a file. Test whether writing to the file and
-		// reading from the file works correctly.
-		pipe->setThreshold(5);
-		init();
-		write("hello");
-		ensure_equals(getBufferSize(), 5u);
-		ensure_equals(getDataState(), FileBackedPipe::IN_MEMORY);
-		write("world");
-		ensure_equals(getBufferSize(), 10u);
-		EVENTUALLY(5,
-			result = getBufferSize() == 10 && getDataState() == FileBackedPipe::IN_FILE;
-		);
-		startPipe();
-		EVENTUALLY(5,
-			result = getBufferSize() == 0 && receivedData == "helloworld";
-		);
-	}
-
-	TEST_METHOD(11) {
-		// Test end() on a started, empty pipe.
-		init();
-		startPipe();
-		endPipe();
-		ensure_equals(consumeCallbackCount, 0);
-		ensure(ended);
-	}
-
-	TEST_METHOD(12) {
-		// Test end() on a started pipe after writing data to
-		// it that's immediately consumed.
-		init();
-		startPipe();
-		write("hello");
-		endPipe();
-		ensure_equals(consumeCallbackCount, 1);
-		ensure_equals(receivedData, "hello");
-		ensure(ended);
-	}
-
-	TEST_METHOD(13) {
-		// Test end() on a started pipe that has data buffered in memory.
-		init();
-		consumeImmediately = false;
-		startPipe();
-		write("hello");
-		endPipe();
-		ensure_equals(getDataState(), FileBackedPipe::IN_MEMORY);
-		ensure(!ended);
-
-		callConsumedCallback(3, false);
-		ensure_equals(receivedData,
-			"hello\n"
-			"lo");
-		ensure(!ended);
-		callConsumedCallback(2, false);
-		ensure(ended);
-	}
-
-	TEST_METHOD(14) {
-		// Test end() on a started pipe that has data buffered on disk.
-		pipe->setThreshold(1);
-		consumeImmediately = false;
-		init();
-		startPipe();
-		write("hello");
-		endPipe();
-		EVENTUALLY(5,
-			result = getDataState() == FileBackedPipe::IN_FILE && !ended;
-		);
-
-		callConsumedCallback(3, false);
-		EVENTUALLY(5,
-			result =
-				receivedData ==
-					"hello\n"
-					"lo"
-				&& !ended;
-		);
-
-		callConsumedCallback(2, false);
-		ensure(ended);
-	}
-
-	TEST_METHOD(15) {
-		// Test end() on an empty, stopped pipe.
-		init();
-		endPipe();
-		startPipe();
-		ensure_equals(consumeCallbackCount, 0);
-		ensure_equals(receivedData, "");
-		ensure(ended);
-	}
-
-	TEST_METHOD(16) {
-		// Test end() on a non-empty, stopped pipe with dataState == IN_MEMORY.
-		init();
-		write("hello");
-		endPipe();
-		startPipe();
-		EVENTUALLY(5,
-			result = consumeCallbackCount == 1;
-		);
-		ensure_equals(receivedData, "hello");
-		ensure(ended);
-	}
-
-	TEST_METHOD(17) {
-		// Test end() on a non-empty, stopped pipe with dataState == IN_FILE.
-		pipe->setThreshold(3);
-		pipe->openTimeout = 30;
-		init();
-		write("hello");
-		ensure_equals(getDataState(), FileBackedPipe::OPENING_FILE);
-		endPipe();
-		startPipe();
-		EVENTUALLY(5,
-			result = consumeCallbackCount == 1;
-		);
-		ensure_equals(getDataState(), FileBackedPipe::OPENING_FILE);
-		ensure_equals(receivedData, "hello");
-		ensure(ended);
-	}
-
-	TEST_METHOD(18) {
-		// Test end() on a non-empty, stopped pipe with dataState == IN_FILE.
-		pipe->setThreshold(3);
-		init();
-		write("hello");
-		endPipe();
-		startPipe();
-		EVENTUALLY(5,
-			result = getDataState() == FileBackedPipe::IN_FILE;
-		);
-		EVENTUALLY(5,
-			result = consumeCallbackCount == 1;
-		);
-		ensure_equals(receivedData, "hello");
-		ensure(ended);
-	}
-
-	TEST_METHOD(20) {
-		// Starting a pipe whose end has already been processed will have no effect.
-		init();
-		startPipe();
-		write("hello");
-		endPipe();
-		ensure_equals(consumeCallbackCount, 1);
-		ensure(ended);
-		
-		stopPipe();
-		ensure(reachedEnd());
-		ensure(!isStarted());
-
-		startPipe();
-		ensure_equals(consumeCallbackCount, 1);
-		ensure(ended);
-		ensure(reachedEnd());
-		ensure(!isStarted());
-	}
-
-	TEST_METHOD(21) {
-		// If the written data is immediately consumed, then write() returns true
-		// and the commit callback is never called.
-		init();
-		startPipe();
-		ensure(write("hello"));
-		SHOULD_NEVER_HAPPEN(40,
-			result = commitCount > 0;
-		);
-	}
-
-	TEST_METHOD(22) {
-		// If the written data is not immediately consumed but fits
-		// into the memory buffer, then write() returns true and the
-		// commit callback is never called.
-		consumeImmediately = false;
-		init();
-		startPipe();
-		ensure(write("hello"));
-		SHOULD_NEVER_HAPPEN(40,
-			result = commitCount > 0;
-		);
-	}
-	
-	TEST_METHOD(23) {
-		// If the pipe is paused and the written data fits into the memory
-		// buffer, then write() returns true and the commit callback is never called.
-		init();
-		ensure(write("hello"));
-		SHOULD_NEVER_HAPPEN(40,
-			result = commitCount > 0;
-		);
-	}
-
-	TEST_METHOD(24) {
-		// If the written data is not immediately consumed and must be written
-		// to the disk, then write() returns false. onCommit is called after
-		// the data has been written out to the disk.
-		pipe->setThreshold(3);
-		pipe->openTimeout = 20;
-		init();
-		ensure(!write("hello"));
-		ensure("committing to disk", isCommittingToDisk());
-		EVENTUALLY(1,
-			result = commitCount == 1;
-		);
-		ensure("not committing to disk", !isCommittingToDisk());
-	}
-
-	TEST_METHOD(25) {
-		// It may be reset inside the onData callback.
-		resetOnData = true;
-		consumeImmediately = false;
-		init();
-		startPipe();
-		write("hello");
-		ensure(!isStarted());
-		ensure_equals(getBufferSize(), 0u);
-	}
-
-	TEST_METHOD(26) {
-		// It may be reset inside the onData callback while there is data buffered in memory.
-		consumeImmediately = false;
-		init();
-		startPipe();
-		write("hello");
-		ensure_equals("(1)", getBufferSize(), 5u);
-		resetOnData = true;
-		callConsumedCallback(1, false);
-		ensure("(2)", !isStarted());
-		ensure_equals("(3)", getBufferSize(), 0u);
-	}
-
-	TEST_METHOD(27) {
-		// It may be reset inside the onData callback while there is data buffered in memory,
-		// soon to be written on disk.
-		pipe->setThreshold(3);
-		pipe->openTimeout = 40;
-		consumeImmediately = false;
-		init();
-		startPipe();
-		write("hello");
-		ensure_equals("(1)", getBufferSize(), 5u);
-		ensure("(2)", isCommittingToDisk());
-		usleep(20000);
-		ensure("(3)", isCommittingToDisk());
-		resetOnData = true;
-		callConsumedCallback(1, false);
-		ensure("(4)", !isStarted());
-		ensure_equals("(5)", getBufferSize(), 0u);
-	}
-
-	TEST_METHOD(28) {
-		// It may be reset inside the onData callback while there is data buffered on disk.
-		pipe->setThreshold(3);
-		consumeImmediately = false;
-		init();
-		startPipe();
-		write("hello");
-		ensure_equals("(1)", getBufferSize(), 5u);
-		usleep(20000);
-		ensure("(2)", !isCommittingToDisk());
-
-		resetOnData = true;
-		// The following call will trigger a libeio read operation on the buffer file.
-		callConsumedCallback(1, false);
-
-		EVENTUALLY(1,
-			result = !isStarted();
-		);
-		ensure("(3)", !isStarted());
-		ensure_equals("(4)", getBufferSize(), 0u);
-	}
-}