Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

1 files changed, 15 insertions, 1 deletions

diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index 6dbdcb86e7..4c9e75456a 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -166,7 +166,21 @@ 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);
+/*==========================================================================*|
+		// nat 2009-10-20: not sure this ensure() is such a good idea, at
+		// least with "google.com". The logic below is failing for me with:
+		// set 'google.com'; reported 'yx-in-f100.1e100.net'
+		// Disabling test until we can replace it with something more robust.
+		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