summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-28 21:54:21 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-28 21:54:21 +0200
commit73eec8913135127a1d31d3f1dc766f96908f984d (patch)
tree66ae3fec58046505fc80b15352957696d1ab4378 /indra/test
parentce6dd53f9c364f46e30d0eedb1c6a701fbad8885 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge branch 'master' into DRTVWR-540-maint
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
Diffstat (limited to 'indra/test')
-rwxr-xr-xindra/test/test_llmanifest.py10
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__':