Python version check is confusing in test-webkitpy

https://bugs.webkit.org/show_bug.cgi?id=68004

Patch by Tom Zakrajsek <tomz@codeaurora.org> on 2011-09-15
Reviewed by Adam Barth.

* Scripts/test-webkitpy:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index faa90ba..48a587b 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-15  Tom Zakrajsek  <tomz@codeaurora.org>
+
+        Python version check is confusing in test-webkitpy
+        https://bugs.webkit.org/show_bug.cgi?id=68004
+
+        Reviewed by Adam Barth.
+
+        * Scripts/test-webkitpy:
+
 2011-09-15  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.

diff --git a/Tools/Scripts/test-webkitpy b/Tools/Scripts/test-webkitpy
index 7c11e85..083fb77 100755 (executable)
--- a/Tools/Scripts/test-webkitpy
+++ b/Tools/Scripts/test-webkitpy
@@ -216,17 +216,16 @@ def init(command_args, external_package_paths):
 
     versioning.check_version(log=_log)
 
-    (comparison, current_version, minimum_version) = \
+    (comparison, current_version, expected_version) = \
         versioning.compare_version()
 
-    if comparison > 0:
-        # Then the current version is later than the minimum version.
-        message = ("You are testing webkitpy with a Python version (%s) "
-                   "higher than the minimum version (%s) it was meant "
-                   "to support." % (current_version, minimum_version))
+    if comparison != 0:
+        # Then the current version is not what we expect.
+        message = ("You are testing webkitpy with Python version (%s) "
+                   "instead of version (%s) which we support.  Please verify "
+                   "changes against version (%s)" % (current_version, expected_version, expected_version))
         _log.warn(message)
 
-
 def _path_from_webkit_root(*components):
     webkit_root = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
     return os.path.join(webkit_root, *components)