From f411b5f89a770de6326428b3d663cbfa10430f73 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Sun, 31 Jan 2016 01:40:44 -0500
Subject: [PATCH] Disable tests not relevent to our gridmanager usage
---
indra/newview/tests/llviewernetwork_test.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 91d26c6a40..267a124c5a 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -197,9 +197,9 @@ namespace tut
ensure_equals("id for agni",
std::string("Agni"),
LLGridManager::getInstance()->getGridId("util.agni.lindenlab.com"));
- ensure_equals("update url base for Agni", // relies on agni being the default
- std::string("https://update.secondlife.com/update"),
- LLGridManager::getInstance()->getUpdateServiceURL());
+ //ensure_equals("update url base for Agni", // relies on agni being the default
+ // std::string("https://update.secondlife.com/update"),
+ // LLGridManager::getInstance()->getUpdateServiceURL());
ensure_equals("label for agni",
LLGridManager::getInstance()->getGridLabel("util.agni.lindenlab.com"),
std::string("Second Life"));
@@ -271,9 +271,9 @@ namespace tut
ensure_equals("id for agni",
LLGridManager::getInstance()->getGridId("util.agni.lindenlab.com"),
std::string("Agni"));
- ensure_equals("update url base for Agni", // relies on agni being the default
- std::string("https://update.secondlife.com/update"),
- LLGridManager::getInstance()->getUpdateServiceURL());
+ //ensure_equals("update url base for Agni", // relies on agni being the default
+ // std::string("https://update.secondlife.com/update"),
+ // LLGridManager::getInstance()->getUpdateServiceURL());
ensure_equals("label for agni",
LLGridManager::getInstance()->getGridLabel("util.agni.lindenlab.com"),
std::string("Second Life"));
@@ -402,9 +402,9 @@ namespace tut
ensure_equals("getLoginPage",
LLGridManager::getInstance()->getLoginPage(),
std::string("http://viewer-login.agni.lindenlab.com/"));
- ensure_equals("update url base for Agni", // relies on agni being the default
- std::string("https://update.secondlife.com/update"),
- LLGridManager::getInstance()->getUpdateServiceURL());
+ //ensure_equals("update url base for Agni", // relies on agni being the default
+ // std::string("https://update.secondlife.com/update"),
+ // LLGridManager::getInstance()->getUpdateServiceURL());
ensure("Is Agni Second Life", LLGridManager::getInstance()->isInSecondlife());
ensure("Agni is NOT OpenSim", !LLGridManager::getInstance()->isInOpenSim());
std::vector<std::string> uris;
--
GitLab