diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-01 15:47:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-01 15:47:50 -0500 |
| commit | 3c65f7fef08c440e65123b727036522d7d51fc6f (patch) | |
| tree | fbd2e9a00d11a6e2f0d1e5de7501c676278c1824 | |
| parent | e44c097aee27526869321a4ccd9b240cfbecabc0 (diff) | |
| parent | fd96fe41a67ce245134fe26bb8d1d1bb20df6c24 (diff) | |
merge fix for unit test problem with some python configurations
| -rw-r--r-- | indra/llcommon/tests/llleap_test.cpp | 9 | ||||
| -rw-r--r-- | indra/llcommon/tests/llsdserialize_test.cpp | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp index 9b755e9ca5..29060d4ef5 100644 --- a/indra/llcommon/tests/llleap_test.cpp +++ b/indra/llcommon/tests/llleap_test.cpp @@ -122,13 +122,10 @@ 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" - "try:\n" - " from llbase import llsd\n" - "except ImportError:\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 indra.base import llsd\n" + "sys.path.insert(0,\n" + " os.path.join(mydir, os.pardir, os.pardir, 'lib', 'python'))\n" + "from indra.base import llsd\n" "\n" "class ProtocolError(Exception):\n" " def __init__(self, msg, data):\n" diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index e625545763..4d436e8897 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1523,10 +1523,7 @@ namespace tut "sys.path.insert(0,\n" " os.path.join(os.path.dirname(r'" __FILE__ "'),\n" " os.pardir, os.pardir, 'lib', 'python'))\n" - "try:\n" - " from llbase import llsd\n" - "except ImportError:\n" - " from indra.base import llsd\n") + "from indra.base import llsd\n") {} ~TestPythonCompatible() {} |