Tools/Scripts/webkitpy/common/system/executive_unittest.py - Issue 478553002: Remove thirdparty/unittest2 from webkitpy and require python2.7.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Tools/Scripts/webkitpy/common/system/executive_unittest.py

Issue 478553002: Remove thirdparty/unittest2 from webkitpy and require python2.7. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Tools/Scripts/webkitpy/common/system/executive_unittest.py

diff --git a/Tools/Scripts/webkitpy/common/system/executive_unittest.py b/Tools/Scripts/webkitpy/common/system/executive_unittest.py

index 4c5faae90d870bdbfbd12f27cbb43c5c7aac8651..304dc873c7490ace9c5506c1400f163fecac97a5 100644

--- a/Tools/Scripts/webkitpy/common/system/executive_unittest.py

+++ b/Tools/Scripts/webkitpy/common/system/executive_unittest.py

@@ -33,6 +33,7 @@ import signal

import subprocess

import sys

import time

+import unittest

# Since we execute this script directly as part of the unit tests, we need to ensure

# that Tools/Scripts and Tools/Scripts/thirdparty are in sys.path for the next imports to work correctly.

@@ -43,7 +44,6 @@ third_party_py = os.path.join(script_dir, "webkitpy", "thirdparty")

if third_party_py not in sys.path:

sys.path.append(third_party_py)

-import webkitpy.thirdparty.unittest2 as unittest

from webkitpy.common.system.executive import Executive, ScriptError

from webkitpy.common.system.filesystem_mock import MockFileSystem