From f9f2852ff2d1b11b3bba5811192ccb89c9354877 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 12 Nov 2009 09:19:32 -0800
Subject: DEV-42715 Fixed lllogin SRV request timeout unit test. Also made SRV
 config options not persistent. reviewed by brad

---
 indra/newview/app_settings/settings.xml              |  4 ++--
 indra/viewer_components/login/tests/lllogin_test.cpp | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dccf4de651..a530b800a3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4253,7 +4253,7 @@
     <key>Comment</key>
     <string>Duration in seconds of the login SRV request timeout</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
@@ -4264,7 +4264,7 @@
     <key>Comment</key>
     <string>Name of the message pump that handles SRV request</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
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"); 
 	}
 }
-- 
cgit v1.2.3