diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
| commit | e70fe3a50d43bd5276f80c9f82fcfb2de02109cb (patch) | |
| tree | c35ab61e94d7b93e0e8be63f60c439d3b6a8c4b9 /indra/test | |
| parent | 15861d8dec096de57b0b51fa55a61a199a0f4337 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.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__': |