merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.

Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py
index 2c4662a83d..1edcc9f2ad 100644
--- a/indra/test/test_llmanifest.py
+++ b/indra/test/test_llmanifest.py
@@ -86,9 +86,13 @@ class TestLLManifest(unittest.TestCase):
 
     def testruncommand(self):
         self.assertEqual("Hello\n", self.m.run_command("echo Hello"))
-        def tmp_test():
+        def exit_1_test():
+            self.m.run_command("exit 1")
+        self.assertRaises(RuntimeError, exit_1_test)
+        def not_found_test():
             self.m.run_command("test_command_that_should_not_be_found")
-        self.assertRaises(RuntimeError, tmp_test)
+        self.assertRaises(RuntimeError, not_found_test)
+
 
     def testpathof(self):
         self.assertEqual(self.m.src_path_of("a"), "src/a")