summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2010-02-03 16:18:11 -0500
committerNat Goodspeed <nat@lindenlab.com>2010-02-03 16:18:11 -0500
commitad6bc3f1ea87c915fb80127d11afb466ebe4d716 (patch)
tree7dbea3000c1d47b45309aa437479824294546155 /indra
parent1e6d2c9cd3d8e3a7ee48601ca0ecf0cf8dc4f809 (diff)
parent5d3e35db069d47b38e98d4e13a203e7c303a20a6 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra')
-rw-r--r--indra/test/llhttpclient_tut.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp
index c541997e89..2b1496e912 100644
--- a/indra/test/llhttpclient_tut.cpp
+++ b/indra/test/llhttpclient_tut.cpp
@@ -269,6 +269,7 @@ namespace tut
template<> template<>
void HTTPClientTestObject::test<2>()
{
+ skip("error test depends on dev's local ISP not supplying \"helpful\" search page");
LLHTTPClient::get("http://www.invalid", newResult());
runThePump();
ensureStatusError();