Rev 4662: Review feedback. in http://bazaar.launchpad.net/~lifeless/bzr/test-speed

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/test-speed

------------------------------------------------------------
revno: 4662
revision-id: robertc at robertcollins.net-20090828210531-mrjayxzjy186celn
parent: robertc at robertcollins.net-20090827221735-dck1jb1uhktda57h
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-speed
timestamp: Sat 2009-08-29 07:05:31 +1000
message:
  Review feedback.
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-08-27 22:17:35 +0000
+++ b/bzrlib/tests/__init__.py	2009-08-28 21:05:31 +0000
@@ -937,14 +937,7 @@
         if backing_server is None:
             transport_server.setUp()
         else:
-            try:
-                transport_server.setUp(backing_server)
-            except TypeError, e:
-                # This should never happen; the try:Except here is to assist
-                # developers having to update code rather than seeing an
-                # uninformative TypeError.
-                raise Exception, "Old server API in use: %s, %s" % (
-                    transport_server, e)
+            transport_server.setUp(backing_server)
         self.addCleanup(transport_server.tearDown)
 
     def _ndiff_strings(self, a, b):

=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py	2009-08-27 22:17:35 +0000
+++ b/bzrlib/tests/test_remote.py	2009-08-28 21:05:31 +0000
@@ -2780,7 +2780,7 @@
         stacked_branch.set_stacked_on_url('../base')
         # start a server looking at this
         smart_server = server.SmartTCPServer_for_testing()
-        self.start_series(smart_server)
+        self.start_server(smart_server)
         remote_bzrdir = BzrDir.open(smart_server.get_url() + '/stacked')
         # can get its branch and repository
         remote_branch = remote_bzrdir.open_branch()