summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-07-15 16:01:43 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-07-15 16:01:43 -0400
commite41c4c90f0d8c935fa8e4de6a8439d00283c3206 (patch)
tree2568fbb94e92c4b618cf10bb1223fc60f7928e40 /indra
parentfee07bb597a64489b8e4bca8513ebd2afd9e7b6e (diff)
Not all TC agents have llbase.llsd, fall back to indra.base.llsd
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index b0c0df192c..30cc2bbc8a 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1802,7 +1802,10 @@ namespace tut
python("read C++ notation",
lambda::_1 <<
- "from llbase import llsd\n"
+ "try:\n"
+ " from llbase import llsd\n"
+ "except ImportError:\n"
+ " from indra.base import llsd\n"
"def parse_each(iterable):\n"
" for item in iterable:\n"
" yield llsd.parse(item)\n" <<
@@ -1823,7 +1826,10 @@ namespace tut
python("write Python notation",
lambda::_1 <<
"from __future__ import with_statement\n"
- "from llbase import llsd\n"
+ "try:\n"
+ " from llbase import llsd\n"
+ "except ImportError:\n"
+ " from indra.base import llsd\n"
"DATA = [\n"
" 17,\n"
" 3.14,\n"