summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2010-02-03 16:48:10 -0500
committerNat Goodspeed <nat@lindenlab.com>2010-02-03 16:48:10 -0500
commit0bee31de32cb5999e7ec06d74f55d34ce0ac052b (patch)
tree7f9dc86550ee48bb2d1e1fb415a8c731457af93c /indra
parent9b44d686d8e92011ea2704a3fe1978e0f57aed7d (diff)
parentad6bc3f1ea87c915fb80127d11afb466ebe4d716 (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();