summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-11-12 09:19:32 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-11-12 09:19:32 -0800
commitf9f2852ff2d1b11b3bba5811192ccb89c9354877 (patch)
treebb67beab762b09c04363ac023ce5b2f0fe1a3c26 /indra/viewer_components
parent51e3a486c6de28eb0a722edeee685192e9bde1b2 (diff)
DEV-42715 Fixed lllogin SRV request timeout unit test.
Also made SRV config options not persistent. reviewed by brad
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/login/tests/lllogin_test.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
index c3b1838422..56c21016bd 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -441,6 +441,14 @@ namespace tut
login.connect("login.bar.com", credentials);
- ensure_equals("Failed to offline", listener.lastEvent()["change"].asString(), "srvrequest");
+ ensure_equals("SRV State", listener.lastEvent()["change"].asString(), "srvrequest");
+
+ // Get the mainloop eventpump, which needs a pinging in order to drive the
+ // SRV timeout.
+ LLEventPump& mainloop(LLEventPumps::instance().obtain("mainloop"));
+ LLSD frame_event;
+ mainloop.post(frame_event);
+
+ ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login");
}
}