2011-06-27 Adam Barth <abarth@webkit.org>

        Reviewed by Eric Seidel.

        Move deduplicate_tests.py into webkitpy.to_be_moved
        https://bugs.webkit.org/show_bug.cgi?id=63426

        deduplicate_tests.py doesn't haven anything to do with layout tests.
        It's really a separate script.  This patch moves it to the (new)
        to_be_moved package so that it doesn't distract us when working on NRWT.

        * Scripts/deduplicate-tests:
        * Scripts/webkitpy/layout_tests/deduplicate_tests.py: Removed.
        * Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py: Removed.
        * Scripts/webkitpy/test/main.py:
        * Scripts/webkitpy/to_be_moved: Added.
        * Scripts/webkitpy/to_be_moved/__init__.py: Added.
        * Scripts/webkitpy/to_be_moved/deduplicate_tests.py: Copied from Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py.
        * Scripts/webkitpy/to_be_moved/deduplicate_tests_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ae4d885cd7c454bb0269d4f62443fd781111b62d..e17132c87ca5f8501332fd1e77854ab34615c00e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,23 @@
+2011-06-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move deduplicate_tests.py into webkitpy.to_be_moved
+        https://bugs.webkit.org/show_bug.cgi?id=63426
+
+        deduplicate_tests.py doesn't haven anything to do with layout tests.
+        It's really a separate script.  This patch moves it to the (new)
+        to_be_moved package so that it doesn't distract us when working on NRWT.
+
+        * Scripts/deduplicate-tests:
+        * Scripts/webkitpy/layout_tests/deduplicate_tests.py: Removed.
+        * Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py: Removed.
+        * Scripts/webkitpy/test/main.py:
+        * Scripts/webkitpy/to_be_moved: Added.
+        * Scripts/webkitpy/to_be_moved/__init__.py: Added.
+        * Scripts/webkitpy/to_be_moved/deduplicate_tests.py: Copied from Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py.
+        * Scripts/webkitpy/to_be_moved/deduplicate_tests_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py.
+
 2011-06-26  Adam Barth  <abarth@webkit.org>
 
         Rubber-stamped by Eric Seidel.

diff --git a/Tools/Scripts/deduplicate-tests b/Tools/Scripts/deduplicate-tests
index f0afe13458b638a4da23ac125a54da3df9f63d10..1dc6440ad5127d2ba7e00d9e9fa4728444a1f91a 100755 (executable)
--- a/Tools/Scripts/deduplicate-tests
+++ b/Tools/Scripts/deduplicate-tests
@@ -37,7 +37,7 @@ This command dumps out all such files.  You can use it like this:
 
 import optparse
 import webkitpy.common.system.logutils as logutils
-import webkitpy.layout_tests.deduplicate_tests as deduplicate_tests
+import webkitpy.to_be_moved.deduplicate_tests as deduplicate_tests
 
 
 def parse_args():

diff --git a/Tools/Scripts/webkitpy/test/main.py b/Tools/Scripts/webkitpy/test/main.py
index 5d02448eff6c4b2a1d617b3330f4f61985cea754..4c99f760da496438119cbc214a8c7a59b17c5a40 100644 (file)
--- a/Tools/Scripts/webkitpy/test/main.py
+++ b/Tools/Scripts/webkitpy/test/main.py
@@ -90,7 +90,7 @@ class Tester(object):
 
         return module_path not in [
             # FIXME: This file also requires common.checkout to work
-            'webkitpy.layout_tests.deduplicate_tests_unittest',
+            'webkitpy.to_be_moved.deduplicate_tests_unittest',
         ]
 
     def run_tests(self, sys_argv, external_package_paths=None):

diff --git a/Tools/Scripts/webkitpy/to_be_moved/__init__.py b/Tools/Scripts/webkitpy/to_be_moved/__init__.py
new file mode 100644 (file)
index 0000000..c0528b7
--- /dev/null
+++ b/Tools/Scripts/webkitpy/to_be_moved/__init__.py
@@ -0,0 +1,10 @@
+# Required for Python to search this directory for module files
+# This directory houses Python modules that do not yet have a proper home.
+#
+# Some of the Python modules in this directory aren't really part of webkitpy
+# in the sense that they're not classes that are meant to be used as part of
+# the webkitpy library. Instead, they're a bunch of helper code for individual
+# scripts in in Tools/Scripts.
+#
+# Really, all this code should either be refactored or moved somewhere else,
+# hence the somewhat lame name for this directory.

diff --git a/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py b/Tools/Scripts/webkitpy/to_be_moved/deduplicate_tests.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py
rename to Tools/Scripts/webkitpy/to_be_moved/deduplicate_tests.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py b/Tools/Scripts/webkitpy/to_be_moved/deduplicate_tests_unittest.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py
rename to Tools/Scripts/webkitpy/to_be_moved/deduplicate_tests_unittest.py