test/cxx/ApplicationPool2/ProcessTest.cpp in passenger-4.0.20 vs test/cxx/ApplicationPool2/ProcessTest.cpp in passenger-4.0.21
- old
+ new
@@ -17,11 +17,11 @@
ApplicationPool2_ProcessTest() {
bg.start();
struct sockaddr_in addr;
socklen_t len = sizeof(addr);
- sockets = make_shared<SocketList>();
+ sockets = boost::make_shared<SocketList>();
server1 = createTcpServer("127.0.0.1", 0);
getsockname(server1, (struct sockaddr *) &addr, &len);
sockets->add("main1",
"tcp://127.0.0.1:" + toString(addr.sin_port),
@@ -46,22 +46,22 @@
DEFINE_TEST_GROUP(ApplicationPool2_ProcessTest);
TEST_METHOD(1) {
// Test initial state.
- ProcessPtr process = make_shared<Process>(bg.safe,
+ ProcessPtr process = boost::make_shared<Process>(bg.safe,
123, "", "", adminSocket[0],
errorPipe[0], sockets, 0, 0);
process->dummy = true;
process->requiresShutdown = false;
ensure_equals(process->utilization(), 0);
ensure(!process->atFullCapacity());
}
TEST_METHOD(2) {
// Test opening and closing sessions.
- ProcessPtr process = make_shared<Process>(bg.safe,
+ ProcessPtr process = boost::make_shared<Process>(bg.safe,
123, "", "", adminSocket[0],
errorPipe[0], sockets, 0, 0);
process->dummy = true;
process->requiresShutdown = false;
SessionPtr session = process->newSession();
@@ -74,11 +74,11 @@
}
TEST_METHOD(3) {
// newSession() checks out the socket with the smallest utilization number
// and sessionClosed() restores the session utilization statistics.
- ProcessPtr process = make_shared<Process>(bg.safe,
+ ProcessPtr process = boost::make_shared<Process>(bg.safe,
123, "", "", adminSocket[0],
errorPipe[0], sockets, 0, 0);
process->dummy = true;
process->requiresShutdown = false;
@@ -119,10 +119,10 @@
ensure_equals(sessionCount[1], 2);
}
TEST_METHOD(4) {
// If all sockets are at their full capacity then newSession() will fail.
- ProcessPtr process = make_shared<Process>(bg.safe,
+ ProcessPtr process = boost::make_shared<Process>(bg.safe,
123, "", "", adminSocket[0],
errorPipe[0], sockets, 0, 0);
process->dummy = true;
process->requiresShutdown = false;
vector<SessionPtr> sessions;