summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests/llhost_test.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-02 14:16:08 -0800
committerPalmer <palmer@lindenlab.com>2009-11-02 14:16:08 -0800
commitb81feb6ae7fd9d01b63999e53c5c231551d53200 (patch)
tree527df9920d7d27000981fe726e5fbed9deccadbd /indra/llmessage/tests/llhost_test.cpp
parent3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff)
parent74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff)
Merge of viewer-2-0 changes
Diffstat (limited to 'indra/llmessage/tests/llhost_test.cpp')
-rw-r--r--indra/llmessage/tests/llhost_test.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index 2424dbcb6b..7e5c3a117b 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -157,7 +157,8 @@ namespace tut
template<> template<>
void host_object::test<9>()
{
- std::string hostStr = "linux.org";
+// skip("setHostByName(\"google.com\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\"");
+ std::string hostStr = "linux.org";
LLHost host;
host.setHostByName(hostStr);
@@ -166,7 +167,15 @@ namespace tut
// the main domain name and not do the exact compare
std::string hostname = host.getHostName();
- ensure("getHostName failed", hostname.find(hostStr) != std::string::npos);
+ try
+ {
+ ensure("getHostName failed", hostname.find(hostStr) != std::string::npos);
+ }
+ catch (const std::exception&)
+ {
+ std::cerr << "set '" << hostStr << "'; reported '" << hostname << "'" << std::endl;
+ throw;
+ }
}
// setHostByName for dotted IP