summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-03 17:56:36 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-03 17:56:36 -0500
commitd49e5bcbe26a4b148ce1d20a60d16581f41134c0 (patch)
treebd8caf39e789437574119304688ba3c71b7940cf /indra/test
parent1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff)
parent9d71aae8273fd44dada82b1005c121255dc14dda (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/test')
-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();