buildbot should not rely on webkitpy
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2013 04:01:57 +0000 (04:01 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2013 04:01:57 +0000 (04:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=107379

Reviewed by Eric Seidel.

Move all Python files used in buildbot configuration into BuildSlaveSupport directory.
Once this patch is landed, we can stop restarting the master on webkitpy changes.

* BuildSlaveSupport/build.webkit.org-config/committer_auth.py:
* BuildSlaveSupport/build.webkit.org-config/htdigestparser.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser.py.
* BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser_unittest.py.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py: Copied from Tools/Scripts/webkitpy/common/config/build.py.
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py: Copied from Tools/Scripts/webkitpy/common/config/build_unittest.py.
(ShouldBuildTest.test_should_build):
* Scripts/webkitpy/common/config/build.py: Removed.
* Scripts/webkitpy/common/config/build_unittest.py: Removed.
* Scripts/webkitpy/common/net/htdigestparser.py: Removed.
* Scripts/webkitpy/common/net/htdigestparser_unittest.py: Removed.

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

Tools/BuildSlaveSupport/build.webkit.org-config/committer_auth.py
Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser.py [moved from Tools/Scripts/webkitpy/common/net/htdigestparser.py with 100% similarity]
Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py [moved from Tools/Scripts/webkitpy/common/net/htdigestparser_unittest.py with 91% similarity]
Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py [moved from Tools/Scripts/webkitpy/common/config/build.py with 100% similarity]
Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py [moved from Tools/Scripts/webkitpy/common/config/build_unittest.py with 87% similarity]
Tools/ChangeLog

index 6f4d3600d7293a650591a5077a18597aea35f544..cf123a2834e84251fcdc8426c84a2f4762b79e2b 100644 (file)
@@ -27,7 +27,7 @@ import buildbot.status.web.auth
 import json
 import zope.interface
 
-from webkitpy.common.net.htdigestparser import HTDigestParser
+from htdigestparser import HTDigestParser
 
 
 class Error(Exception):
similarity index 91%
rename from Tools/Scripts/webkitpy/common/net/htdigestparser_unittest.py
rename to Tools/BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py
index 367c86268e7c6f5b295a6ab0c321d8eaec0b4986..c689273cb78802c33f7c95d3918e817b2403b28d 100644 (file)
@@ -24,7 +24,7 @@ import StringIO
 import os
 import unittest2 as unittest
 
-from webkitpy.common.net.htdigestparser import HTDigestParser
+from htdigestparser import HTDigestParser
 
 
 class HTDigestParserTest(unittest.TestCase):
@@ -80,3 +80,12 @@ user2:realm 2:14f827686fa97778f02fe1314a3337c8
 user3:realm 1:1817fc8a24119cc57fbafc8a630ea5a5
 user3:realm 3:a05f5a2335e9d87bbe75bbe5e53248f0
 """)
+
+
+# FIXME: We should run this file as part of test-rm .
+# Unfortunately test-rm  currently requires that unittests
+# be located in a directory with a valid module name.
+# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
+# so for now this is a stand-alone test harness.
+if __name__ == '__main__':
+    unittest.main()
index 3627af1b999f76dec484c60097cea14ebc1396dc..1cbcd469be54b31f8783a79259a085dc2060d324 100644 (file)
@@ -21,7 +21,7 @@ import operator
 import urllib
 
 from committer_auth import CommitterAuth
-from webkitpy.common.config import build as wkbuild
+import wkbuild
 
 
 c = BuildmasterConfig = {}
similarity index 87%
rename from Tools/Scripts/webkitpy/common/config/build_unittest.py
rename to Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
index deb7b923259d96db3870a7b8b0f9ecacaeb7f0ef..5b4556a3a1c34ff586a094d123b2ad8ab49c5dbb 100644 (file)
@@ -22,7 +22,7 @@
 
 import unittest2 as unittest
 
-from webkitpy.common.config import build
+import wkbuild
 
 
 class ShouldBuildTest(unittest.TestCase):
@@ -60,7 +60,15 @@ class ShouldBuildTest(unittest.TestCase):
     def test_should_build(self):
         for files, platforms in self._should_build_tests:
             # FIXME: We should test more platforms here once
-            # build._should_file_trigger_build is implemented for them.
+            # wkbuild._should_file_trigger_build is implemented for them.
             for platform in ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard", "win"]:
                 should_build = platform in platforms or "*" in platforms
-                self.assertEqual(build.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
+                self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
+
+# FIXME: We should run this file as part of test-rm .
+# Unfortunately test-rm  currently requires that unittests
+# be located in a directory with a valid module name.
+# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
+# so for now this is a stand-alone test harness.
+if __name__ == '__main__':
+    unittest.main()
index 6bc4ab1400ea42f370539aa9a6590ac80a6a1341..5a00f9da311c4e2961fdc3abd5f5a606e6cb9941 100644 (file)
@@ -1,3 +1,25 @@
+2013-01-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        buildbot should not rely on webkitpy
+        https://bugs.webkit.org/show_bug.cgi?id=107379
+
+        Reviewed by Eric Seidel.
+
+        Move all Python files used in buildbot configuration into BuildSlaveSupport directory.
+        Once this patch is landed, we can stop restarting the master on webkitpy changes.
+
+        * BuildSlaveSupport/build.webkit.org-config/committer_auth.py:
+        * BuildSlaveSupport/build.webkit.org-config/htdigestparser.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser.py.
+        * BuildSlaveSupport/build.webkit.org-config/htdigestparser_unittest.py: Copied from Tools/Scripts/webkitpy/common/net/htdigestparser_unittest.py.
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py: Copied from Tools/Scripts/webkitpy/common/config/build.py.
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py: Copied from Tools/Scripts/webkitpy/common/config/build_unittest.py.
+        (ShouldBuildTest.test_should_build):
+        * Scripts/webkitpy/common/config/build.py: Removed.
+        * Scripts/webkitpy/common/config/build_unittest.py: Removed.
+        * Scripts/webkitpy/common/net/htdigestparser.py: Removed.
+        * Scripts/webkitpy/common/net/htdigestparser_unittest.py: Removed.
+
 2013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r141349.