From 9e93d24b201d0c43370b278a5bb7f1a2facabc30 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Wed, 20 Jul 2016 15:57:53 -0700
Subject: MAINT=6585: fix llsdserialize_test
---
indra/llcommon/tests/llsdserialize_test.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 6fbb9abfc0..81b930e1e2 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1518,10 +1518,7 @@ namespace tut
// scanner.
import_llsd("import os.path\n"
"import sys\n"
- "sys.path.insert(0,\n"
- " os.path.join(os.path.dirname(r'" __FILE__ "'),\n"
- " os.pardir, os.pardir, 'lib', 'python'))\n"
- "from indra.base import llsd\n")
+ "from llbase import llsd\n")
{}
~TestPythonCompatible() {}
--
cgit v1.2.3
From 84f6b535adc61680e6093db6bae1d17d1733b180 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Thu, 21 Jul 2016 08:28:14 -0700
Subject: MAINT=6585: fix llleap_test to use llbase not indra.base
---
indra/llcommon/tests/llleap_test.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index d342dece84..71aa885514 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -113,7 +113,7 @@ namespace tut
// We expect mydir to be .../indra/llcommon/tests.
"sys.path.insert(0,\n"
" os.path.join(mydir, os.pardir, os.pardir, 'lib', 'python'))\n"
- "from indra.base import llsd\n"
+ "from llbase import llsd\n"
"\n"
"class ProtocolError(Exception):\n"
" def __init__(self, msg, data):\n"
--
cgit v1.2.3
From eb350761f7e0b514f785917dcd9649a4a85db8fc Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Thu, 21 Jul 2016 08:29:45 -0700
Subject: MAINT=6585: remove extraneous path manipulation from llleap_test
---
indra/llcommon/tests/llleap_test.cpp | 3 ---
1 file changed, 3 deletions(-)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 71aa885514..c387da6c48 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -110,9 +110,6 @@ namespace tut
// finding indra/lib/python. Use our __FILE__, with
// raw-string syntax to deal with Windows pathnames.
"mydir = os.path.dirname(r'" << __FILE__ << "')\n"
- // We expect mydir to be .../indra/llcommon/tests.
- "sys.path.insert(0,\n"
- " os.path.join(mydir, os.pardir, os.pardir, 'lib', 'python'))\n"
"from llbase import llsd\n"
"\n"
"class ProtocolError(Exception):\n"
--
cgit v1.2.3