Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py b/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py
index 0ee8b5ad8..de9fa2398 100644
--- a/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py
@@ -31,7 +31,7 @@ import os
 import shutil
 import tempfile
 import threading
-import unittest
+import unittest2 as unittest
 
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.outputcapture import OutputCapture
@@ -168,12 +168,12 @@ class QueueEngineTest(unittest.TestCase):
     def test_now(self):
         """Make sure there are no typos in the QueueEngine.now() method."""
         engine = QueueEngine("test", None, None)
-        self.assertTrue(isinstance(engine._now(), datetime.datetime))
+        self.assertIsInstance(engine._now(), datetime.datetime)
 
     def test_sleep_message(self):
         engine = QueueEngine("test", None, None)
         engine._now = lambda: datetime.datetime(2010, 1, 1)
-        expected_sleep_message = "MESSAGE Sleeping until 2010-01-01 00:02:00 (2 mins)."
+        expected_sleep_message = "MESSAGE Sleeping until 2010-01-01 00:02:00 (120 seconds)."
         self.assertEqual(engine._sleep_message("MESSAGE"), expected_sleep_message)
 
     def setUp(self):
@@ -181,7 +181,3 @@ class QueueEngineTest(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(self.temp_dir)
-
-
-if __name__ == '__main__':
-    unittest.main()