From 9e93d24b201d0c43370b278a5bb7f1a2facabc30 Mon Sep 17 00:00:00 2001 From: Glenn Glazer 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/tests') 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 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/tests') 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 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/tests') 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 From 972b0b2f1bfcad32f2a12b613d4a249658895715 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 12:31:01 -0700 Subject: maint-6633: fix unit test to conform with new desired ordering --- indra/llcommon/tests/llerror_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/tests') diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index f51279e817..404f3e51ae 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -551,9 +551,9 @@ namespace tut function; writeReturningLocationAndFunction(location, function); - ensure_equals("order is location time type function message", + ensure_equals("order is time location type function message", message(0), - location + roswell() + " INFO: " + function + ": apple"); + roswell() + lcoation + " INFO: " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From c39b7f2d88f1e345a0a202b9a624d973bc8c97de Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 13:37:42 -0700 Subject: maint-6633: fix tyop --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/tests') diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 404f3e51ae..b5bd6a7c9e 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + lcoation + " INFO: " + function + ": apple"); + roswell() + location + " INFO: " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From acfbcc73527c85399ebfa750f2cd377debd12cd2 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 14:15:29 -0700 Subject: maint-6633: move INFO around --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/tests') diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index b5bd6a7c9e..b20345d50e 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + location + " INFO: " + function + ": apple"); + roswell() + " INFO:" + location + function + ": apple"); } template<> template<> -- cgit v1.2.3 From cea2e4a7ad0f340c8bc582030490eee1099f19bf Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Oct 2016 15:14:46 -0700 Subject: maint-6633: fix spacing --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/tests') diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index b20345d50e..8e79da9834 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + " INFO:" + location + function + ": apple"); + roswell() + " INFO:" + location + " " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From e6043fad2ab549a16f1bf4e81851357de4995862 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 11 Oct 2016 09:21:33 -0700 Subject: maint-6633: space after colon --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/tests') diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 8e79da9834..64624fc6c2 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + " INFO:" + location + " " + function + ": apple"); + roswell() + " INFO: " + location + " " + function + ": apple"); } template<> template<> -- cgit v1.2.3 From 19f576872aec60aae359e567cdd80f3d081b2b73 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 11 Oct 2016 11:41:25 -0700 Subject: maint-6633: space, the final frontier --- indra/llcommon/tests/llerror_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/tests') diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 64624fc6c2..364d2d13dd 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -553,7 +553,7 @@ namespace tut ensure_equals("order is time location type function message", message(0), - roswell() + " INFO: " + location + " " + function + ": apple"); + roswell() + " INFO: " + location + function + ": apple"); } template<> template<> -- cgit v1.2.3