diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 21:56:25 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 21:56:25 +0200 |
| commit | 1e0eafd50cc03f0796fe8678d3460aac614db603 (patch) | |
| tree | 6b9efda5d63749238a786667fc2ac4c9b3fabfad /indra/test | |
| parent | 1f1d762693027a0f6ce7b913bcc8984767e947be (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
Diffstat (limited to 'indra/test')
| -rwxr-xr-x | indra/test/test_llmanifest.py | 10 |
1 files changed, 5 insertions, 5 deletions
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__': |