BaseTools: update Test scripts support python3

update Test scripts support python2 and python3

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Tests/CToolsTests.py b/BaseTools/Tests/CToolsTests.py
index ab75d9a7dc36352a9b1ca60c0a73931ad9c1942c..f0de44b1416950ebf7797dec6acabe9d80d0b234 100644 (file)
--- a/BaseTools/Tests/CToolsTests.py
+++ b/BaseTools/Tests/CToolsTests.py
@@ -26,7 +26,7 @@ modules = (
 \r
 \r
 def TheTestSuite():\r
-    suites = map(lambda module: module.TheTestSuite(), modules)\r
+    suites = list(map(lambda module: module.TheTestSuite(), modules))\r
     return unittest.TestSuite(suites)\r
 \r
 if __name__ == '__main__':\r

diff --git a/BaseTools/Tests/CheckUnicodeSourceFiles.py b/BaseTools/Tests/CheckUnicodeSourceFiles.py
index 6ae62f180a840090141d4fdf23aafe0e3a7e99c8..c76b2bc20eb8a78dcd47f8fffd4f73ae76aeb888 100644 (file)
--- a/BaseTools/Tests/CheckUnicodeSourceFiles.py
+++ b/BaseTools/Tests/CheckUnicodeSourceFiles.py
@@ -110,7 +110,7 @@ class Tests(TestTools.BaseToolsTest):
         # This test makes sure that BaseTools rejects these characters\r
         # if seen in a .uni file.\r
         #\r
-        data = codecs.BOM_UTF16_LE + '//\x01\xd8 '\r
+        data = codecs.BOM_UTF16_LE + b'//\x01\xd8 '\r
 \r
         self.CheckFile(encoding=None, shouldPass=False, string=data)\r
 \r
@@ -161,7 +161,7 @@ class Tests(TestTools.BaseToolsTest):
         # This test makes sure that BaseTools rejects these characters\r
         # if seen in a .uni file.\r
         #\r
-        data = '\xed\xa0\x81'\r
+        data = b'\xed\xa0\x81'\r
 \r
         self.CheckFile(encoding=None, shouldPass=False, string=data)\r
 \r
@@ -170,7 +170,7 @@ class Tests(TestTools.BaseToolsTest):
         # Same test as testSurrogatePairUnicodeCharInUtf8File, but add\r
         # the UTF-8 BOM\r
         #\r
-        data = codecs.BOM_UTF8 + '\xed\xa0\x81'\r
+        data = codecs.BOM_UTF8 + b'\xed\xa0\x81'\r
 \r
         self.CheckFile(encoding=None, shouldPass=False, string=data)\r
 \r

diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py
index e16e993048e469ea58481e40955375deb40ba298..4332dcdaac5ec51d33cfad9a2cb1b6d7ec302e5c 100644 (file)
--- a/BaseTools/Tests/TestTools.py
+++ b/BaseTools/Tests/TestTools.py
@@ -40,7 +40,7 @@ if PythonSourceDir not in sys.path:
 \r
 def MakeTheTestSuite(localItems):\r
     tests = []\r
-    for name, item in localItems.iteritems():\r
+    for name, item in localItems.items():\r
         if isinstance(item, type):\r
             if issubclass(item, unittest.TestCase):\r
                 tests.append(unittest.TestLoader().loadTestsFromTestCase(item))\r
@@ -146,9 +146,12 @@ class BaseToolsTest(unittest.TestCase):
         return data\r
 \r
     def WriteTmpFile(self, fileName, data):\r
-        f = open(self.GetTmpFilePath(fileName), 'w')\r
-        f.write(data)\r
-        f.close()\r
+        if isinstance(data, bytes):\r
+            with open(self.GetTmpFilePath(fileName), 'wb') as f:\r
+                f.write(data)\r
+        else:\r
+            with open(self.GetTmpFilePath(fileName), 'w') as f:\r
+                f.write(data)\r
 \r
     def GenRandomFileData(self, fileName, minlen = None, maxlen = None):\r
         if maxlen is None: maxlen = minlen\r
@@ -161,7 +164,7 @@ class BaseToolsTest(unittest.TestCase):
         if maxlen is None: maxlen = minlen\r
         return ''.join(\r
             [chr(random.randint(0, 255))\r
-             for x in xrange(random.randint(minlen, maxlen))\r
+             for x in range(random.randint(minlen, maxlen))\r
             ])\r
 \r
     def setUp(self):\r