diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-08-10 02:15:37 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-08-10 02:15:37 +0000 |
| commit | 3b2515fd5ff832fa5faa5384b2c3db919d960509 (patch) | |
| tree | 0206223e8f0987dfe07c402c9ca99cee6685a849 /indra/test | |
| parent | 52cb2aea8667056671b67a3c70eeefd00a061751 (diff) | |
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.
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/lltemplatemessagebuilder_tut.cpp | 2 | ||||
| -rw-r--r-- | indra/test/message_tut.cpp | 2 | ||||
| -rw-r--r-- | indra/test/test_llmanifest.py | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 5bb37b3b92..306aabfe8e 100644 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -16,7 +16,7 @@ #include "llquaternion.h" #include "lltemplatemessagebuilder.h" #include "lltemplatemessagereader.h" -#include "llversion.h" +#include "llversionserver.h" #include "message_prehash.h" #include "u64.h" #include "v3dmath.h" diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp index b2c84d5f54..4007eb17ff 100644 --- a/indra/test/message_tut.cpp +++ b/indra/test/message_tut.cpp @@ -12,7 +12,7 @@ #include "lltut.h" #include "llapr.h" -#include "llversion.h" +#include "llversionserver.h" #include "message.h" #include "message_prehash.h" 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") |