Merged in DV528-merge-6.5.5 (pull request #945)

DRTVWR-528 merge up to 6.5.5

2 files changed, 14 insertions, 13 deletions

diff --git a/indra/test/sync.h b/indra/test/sync.h
index ca8b7262d6..bd837cb730 100644
--- a/indra/test/sync.h
+++ b/indra/test/sync.h
@@ -89,25 +89,26 @@ public:
     /// suspend until "somebody else" has bumped mCond by n steps
     void yield(int n=1)
     {
-        return yield_until(STRINGIZE("Sync::yield_for(" << n << ") timed out after "
-                                     << int(mTimeout.value()) << "ms"),
-                           mCond.get() + n);
+        return yield_until("Sync::yield_for", n, mCond.get() + n);
     }
 
     /// suspend until "somebody else" has bumped mCond to a specific value
     void yield_until(int until)
     {
-        return yield_until(STRINGIZE("Sync::yield_until(" << until << ") timed out after "
-                                     << int(mTimeout.value()) << "ms"),
-                           until);
+        return yield_until("Sync::yield_until", until, until);
     }
 
 private:
-    void yield_until(const std::string& desc, int until)
+    void yield_until(const char* func, int arg, int until)
     {
         std::string name(llcoro::logname());
         LL_DEBUGS() << name << " yield_until(" << until << ") suspending" << LL_ENDL;
-        tut::ensure(name + ' ' + desc, mCond.wait_for_equal(mTimeout, until));
+        if (! mCond.wait_for_equal(mTimeout, until))
+        {
+            tut::fail(STRINGIZE(name << ' ' << func << '(' << arg << ") timed out after "
+                                << int(mTimeout.value()) << "ms (expected " << until
+                                << ", actual " << mCond.get() << ')'));
+        }
         // each time we wake up, bump mCond
         bump();
     }
diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py
index a97abbc6ee..c746d59ff2 100755
--- a/indra/test/test_llmanifest.py
+++ b/indra/test/test_llmanifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 @file test_llmanifest.py
 @author Ryan Williams
@@ -124,10 +124,10 @@ class TestLLManifest(unittest.TestCase):
 
     def testcmakedirs(self):
         self.m.cmakedirs("test_dir_DELETE/nested/dir")
-        self.assert_(os.path.exists("test_dir_DELETE/nested/dir"))
-        self.assert_(os.path.isdir("test_dir_DELETE"))
-        self.assert_(os.path.isdir("test_dir_DELETE/nested"))
-        self.assert_(os.path.isdir("test_dir_DELETE/nested/dir"))
+        self.assertTrue(os.path.exists("test_dir_DELETE/nested/dir"))
+        self.assertTrue(os.path.isdir("test_dir_DELETE"))
+        self.assertTrue(os.path.isdir("test_dir_DELETE/nested"))
+        self.assertTrue(os.path.isdir("test_dir_DELETE/nested/dir"))
         os.removedirs("test_dir_DELETE/nested/dir")
 
 if __name__ == '__main__':