Rev 4935: Merge in the module-available updates in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-permute-for-extension

John Arbash Meinel john at arbash-meinel.com
Tue Dec 22 16:46:16 GMT 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-permute-for-extension

------------------------------------------------------------
revno: 4935 [merge]
revision-id: john at arbash-meinel.com-20091222164603-008xa9x64hel7nfb
parent: john at arbash-meinel.com-20091222162847-tvnsc69to4l4uf5r
parent: john at arbash-meinel.com-20091222164048-hp13oi0wck4mg5sq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-permute-for-extension
timestamp: Tue 2009-12-22 10:46:03 -0600
message:
  Merge in the module-available updates
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-12-22 16:28:47 +0000
+++ b/NEWS	2009-12-22 16:46:03 +0000
@@ -47,6 +47,11 @@
 API Changes
 ***********
 
+* Many test features were renamed from ``FooFeature`` to ``foo_feature``
+  to be consistent with instances being lower case and classes being
+  CamelCase. For the features that were more likely to be used, we added a
+  deprecation thunk, but not all. (John Arbash Meinel)
+
 Internals
 *********
 

=== modified file 'bzrlib/tests/test_groupcompress.py'
--- a/bzrlib/tests/test_groupcompress.py	2009-12-21 18:00:02 +0000
+++ b/bzrlib/tests/test_groupcompress.py	2009-12-22 16:40:48 +0000
@@ -29,7 +29,7 @@
     versionedfile,
     )
 from bzrlib.osutils import sha_string
-from bzrlib.tests.test__groupcompress import compiled_groupcompress
+from bzrlib.tests.test__groupcompress import compiled_groupcompress_feature
 
 
 def load_tests(standard_tests, module, loader):
@@ -39,7 +39,7 @@
     scenarios = [
         ('python', {'compressor': groupcompress.PythonGroupCompressor}),
         ]
-    if compiled_groupcompress.available():
+    if compiled_groupcompress_feature.available():
         scenarios.append(('C',
             {'compressor': groupcompress.PyrexGroupCompressor}))
     return tests.multiply_tests(to_adapt, scenarios, result)
@@ -135,7 +135,7 @@
 
 class TestPyrexGroupCompressor(TestGroupCompressor):
 
-    _test_needs_features = [compiled_groupcompress]
+    _test_needs_features = [compiled_groupcompress_feature]
     compressor = groupcompress.PyrexGroupCompressor
 
     def test_stats(self):

=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2009-12-22 15:50:40 +0000
+++ b/bzrlib/tests/test_knit.py	2009-12-22 16:40:48 +0000
@@ -28,6 +28,7 @@
     multiparent,
     osutils,
     pack,
+    tests,
     )
 from bzrlib.errors import (
     RevisionAlreadyPresent,

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-12-22 15:50:40 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-12-22 16:40:48 +0000
@@ -82,7 +82,7 @@
                           dict(_dir_reader_class=_readdir_pyx.UTF8DirReader,
                                _native_to_unicode=_utf8_to_unicode)))
 
-    if test__walkdirs_win32.Win32ReadDirFeature.available():
+    if test__walkdirs_win32.win32_readdir_feature.available():
         try:
             from bzrlib import _walkdirs_win32
             scenarios.append(

=== modified file 'bzrlib/tests/transport_util.py'
--- a/bzrlib/tests/transport_util.py	2009-09-17 11:54:41 +0000
+++ b/bzrlib/tests/transport_util.py	2009-12-22 16:38:07 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,11 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import bzrlib.hooks
+from bzrlib.tests import features
 
 # SFTPTransport offers better performances but relies on paramiko, if paramiko
 # is not available, we fallback to FtpTransport
-from bzrlib.tests import test_sftp_transport
-if test_sftp_transport.paramiko_loaded:
+if features.paramiko.available():
+    from bzrlib.tests import test_sftp_transport
     from bzrlib.transport import sftp
     _backing_scheme = 'sftp'
     _backing_transport_class = sftp.SFTPTransport



More information about the bazaar-commits mailing list