[Buildbot-commits] buildbot/buildbot/test test_config.py, 1.41, 1.42 test_control.py, 1.14, 1.15 test_status.py, 1.36, 1.37 test_web.py, 1.38, 1.39

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8921/buildbot/test

Modified Files:
	test_config.py test_control.py test_status.py test_web.py 
Log Message:
[project @ more post-Twisted-1.3.0 cleanup: remove twcompat.providedBy, use zope.interface native methods instead]

Original author: warner at lothar.com
Date: 2006-12-11 08:34:42

Index: test_config.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_config.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- test_config.py	11 Dec 2006 08:23:29 -0000	1.41
+++ test_config.py	11 Dec 2006 08:40:17 -0000	1.42
@@ -14,7 +14,6 @@
 except ImportError:
     pass
 
-from buildbot.twcompat import providedBy
 from buildbot.master import BuildMaster
 from buildbot import scheduler
 from twisted.application import service, internet
@@ -392,7 +391,7 @@
         # twisted.application.internet.TCPServer, then extract their .args
         # values to find the TCP ports they want to listen on
         for child in s:
-            if providedBy(child, service.IServiceCollection):
+            if service.IServiceCollection.providedBy(child):
                 for gc in self.servers(child, types):
                     yield gc
             if isinstance(child, types):

Index: test_control.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_control.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- test_control.py	11 Dec 2006 08:23:29 -0000	1.14
+++ test_control.py	11 Dec 2006 08:40:17 -0000	1.15
@@ -7,7 +7,6 @@
 
 from buildbot import master, interfaces
 from buildbot.sourcestamp import SourceStamp
-from buildbot.twcompat import providedBy
 from buildbot.slave import bot
 from buildbot.status.builder import SUCCESS
 from buildbot.process import base
@@ -91,13 +90,13 @@
         return d
 
     def _testRequest_2(self, build_control):
-        self.failUnless(providedBy(build_control, interfaces.IBuildControl))
+        self.failUnless(interfaces.IBuildControl.providedBy(build_control))
         d = build_control.getStatus().waitUntilFinished()
         d.addCallback(self._testRequest_3)
         return d
 
     def _testRequest_3(self, bs):
-        self.failUnless(providedBy(bs, interfaces.IBuildStatus))
+        self.failUnless(interfaces.IBuildStatus.providedBy(bs))
         self.failUnless(bs.isFinished())
         self.failUnlessEqual(bs.getResults(), SUCCESS)
         #self.failUnlessEqual(bs.getResponsibleUsers(), ["bob"]) # TODO

Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- test_status.py	11 Dec 2006 08:23:29 -0000	1.36
+++ test_status.py	11 Dec 2006 08:40:17 -0000	1.37
@@ -8,7 +8,7 @@
 from buildbot import interfaces
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process.base import BuildRequest
-from buildbot.twcompat import implements, providedBy
+from buildbot.twcompat import implements
 from buildbot.status import builder, base
 
 mail = None
@@ -394,7 +394,7 @@
         res = b.getTestResults()
         self.failUnlessEqual(res.keys(), [testname])
         t = res[testname]
-        self.failUnless(providedBy(t, interfaces.ITestResult))
+        self.failUnless(interfaces.ITestResult.providedBy(t))
         self.failUnlessEqual(t.getName(), testname)
         self.failUnlessEqual(t.getResults(), builder.SUCCESS)
         self.failUnlessEqual(t.getText(), ["passed"])

Index: test_web.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_web.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- test_web.py	11 Dec 2006 08:23:29 -0000	1.38
+++ test_web.py	11 Dec 2006 08:40:17 -0000	1.39
@@ -11,7 +11,6 @@
 from twisted.web import client
 
 from buildbot import master, interfaces, sourcestamp
-from buildbot.twcompat import providedBy
 from buildbot.status import html, builder
 from buildbot.changes.changes import Change
 from buildbot.process import base
@@ -146,7 +145,7 @@
 
     def test_webPathname(self):
         # running a t.web.distrib server over a UNIX socket
-        if not providedBy(reactor, IReactorUNIX):
+        if not IReactorUNIX.providedBy(reactor):
             raise unittest.SkipTest("UNIX sockets not supported here")
         config = (base_config +
                   "c['status'] = [html.Waterfall(distrib_port='.web-pb')]\n")