From d09d4e1a7e64b01fa1d9f3015de819a2e7069ac4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 2 Mar 2012 13:43:13 -0500
Subject: [PATCH] Add LLLeap unit tests for strange data on child stdout.
---
indra/llcommon/tests/llleap_test.cpp | 36 ++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 652a95ac6b7..053a6cea801 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -207,6 +207,34 @@ namespace tut
template<> template<>
void object::test<3>()
+ {
+ set_test_name("bad stdout protocol");
+ NamedTempFile script("py",
+ "print 'Hello from Python!'\n");
+ CaptureLog log(LLError::LEVEL_WARN);
+ waitfor(LLLeap::create(get_test_name(),
+ sv(list_of(PYTHON)(script.getName()))));
+ ensure_contains("error log line",
+ log.messageWith("invalid protocol"), "Hello from Python!");
+ }
+
+ template<> template<>
+ void object::test<4>()
+ {
+ set_test_name("leftover stdout");
+ NamedTempFile script("py",
+ "import sys\n"
+ // note lack of newline
+ "sys.stdout.write('Hello from Python!')\n");
+ CaptureLog log(LLError::LEVEL_WARN);
+ waitfor(LLLeap::create(get_test_name(),
+ sv(list_of(PYTHON)(script.getName()))));
+ ensure_contains("error log line",
+ log.messageWith("Discarding"), "Hello from Python!");
+ }
+
+ template<> template<>
+ void object::test<5>()
{
set_test_name("empty plugin vector");
std::string threw;
@@ -221,7 +249,7 @@ namespace tut
}
template<> template<>
- void object::test<4>()
+ void object::test<6>()
{
set_test_name("bad launch");
// Synthesize bogus executable name
@@ -301,7 +329,7 @@ namespace tut
};
template<> template<>
- void object::test<5>()
+ void object::test<7>()
{
set_test_name("round trip");
AckAPI api;
@@ -333,7 +361,7 @@ namespace tut
};
template<> template<>
- void object::test<6>()
+ void object::test<8>()
{
set_test_name("many small messages");
// It's not clear to me whether there's value in iterating many times
@@ -381,7 +409,7 @@ namespace tut
}
template<> template<>
- void object::test<7>()
+ void object::test<9>()
{
set_test_name("very large message");
ReqIDAPI api;
--
GitLab