Rev 3753: Cleanups. in http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix

------------------------------------------------------------
revno: 3753
revision-id: v.ladeuil+lp at free.fr-20081002132432-iwlhbyhmjgxbik99
parent: v.ladeuil+lp at free.fr-20081001065456-11t2baisy3yyf6po
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Thu 2008-10-02 15:24:32 +0200
message:
  Cleanups.
  
  * bzrlib/tests/test_bundle.py: 
  Fix module import order.
  (TestReadMergeableFromUrl.test_smart_server_connection_reset): Add
  comment.
  
  * bzrlib/tests/__init__.py: 
  (test_suite): Fix test module names order.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-09-25 01:11:30 +0000
+++ b/bzrlib/tests/__init__.py	2008-10-02 13:24:32 +0000
@@ -2760,17 +2760,18 @@
     """
     testmod_names = [
                    'bzrlib.doc',
-                   'bzrlib.util.tests.test_bencode',
                    'bzrlib.tests.blackbox',
                    'bzrlib.tests.branch_implementations',
                    'bzrlib.tests.bzrdir_implementations',
                    'bzrlib.tests.commands',
-                   'bzrlib.tests.inventory_implementations',
                    'bzrlib.tests.interrepository_implementations',
                    'bzrlib.tests.intertree_implementations',
+                   'bzrlib.tests.inventory_implementations',
                    'bzrlib.tests.per_lock',
                    'bzrlib.tests.per_repository',
+                   'bzrlib.tests.per_repository_reference',
                    'bzrlib.tests.test__dirstate_helpers',
+                   'bzrlib.tests.test__walkdirs_win32',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',
                    'bzrlib.tests.test_api',
@@ -2795,8 +2796,8 @@
                    'bzrlib.tests.test_delta',
                    'bzrlib.tests.test_deprecated_graph',
                    'bzrlib.tests.test_diff',
+                   'bzrlib.tests.test_directory_service',
                    'bzrlib.tests.test_dirstate',
-                   'bzrlib.tests.test_directory_service',
                    'bzrlib.tests.test_email_message',
                    'bzrlib.tests.test_errors',
                    'bzrlib.tests.test_extract',
@@ -2822,11 +2823,11 @@
                    'bzrlib.tests.test_knit',
                    'bzrlib.tests.test_lazy_import',
                    'bzrlib.tests.test_lazy_regex',
+                   'bzrlib.tests.test_lockable_files',
                    'bzrlib.tests.test_lockdir',
-                   'bzrlib.tests.test_lockable_files',
                    'bzrlib.tests.test_log',
+                   'bzrlib.tests.test_lru_cache',
                    'bzrlib.tests.test_lsprof',
-                   'bzrlib.tests.test_lru_cache',
                    'bzrlib.tests.test_mail_client',
                    'bzrlib.tests.test_memorytree',
                    'bzrlib.tests.test_merge',
@@ -2849,12 +2850,11 @@
                    'bzrlib.tests.test_plugins',
                    'bzrlib.tests.test_progress',
                    'bzrlib.tests.test_read_bundle',
+                   'bzrlib.tests.test_reconcile',
                    'bzrlib.tests.test_reconfigure',
-                   'bzrlib.tests.test_reconcile',
                    'bzrlib.tests.test_registry',
                    'bzrlib.tests.test_remote',
                    'bzrlib.tests.test_repository',
-                   'bzrlib.tests.per_repository_reference',
                    'bzrlib.tests.test_revert',
                    'bzrlib.tests.test_revision',
                    'bzrlib.tests.test_revisionspec',
@@ -2897,10 +2897,9 @@
                    'bzrlib.tests.test_upgrade',
                    'bzrlib.tests.test_upgrade_stacked',
                    'bzrlib.tests.test_urlutils',
-                   'bzrlib.tests.test_versionedfile',
                    'bzrlib.tests.test_version',
                    'bzrlib.tests.test_version_info',
-                   'bzrlib.tests.test__walkdirs_win32',
+                   'bzrlib.tests.test_versionedfile',
                    'bzrlib.tests.test_weave',
                    'bzrlib.tests.test_whitebox',
                    'bzrlib.tests.test_win32utils',
@@ -2910,6 +2909,7 @@
                    'bzrlib.tests.test_xml',
                    'bzrlib.tests.tree_implementations',
                    'bzrlib.tests.workingtree_implementations',
+                   'bzrlib.util.tests.test_bencode',
                    ]
 
     loader = TestUtil.TestLoader()

=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py	2008-09-12 08:02:18 +0000
+++ b/bzrlib/tests/test_bundle.py	2008-10-02 13:24:32 +0000
@@ -29,10 +29,10 @@
     revision as _mod_revision,
     treebuilder,
     )
-from bzrlib.bzrdir import BzrDir
 from bzrlib.bundle import read_mergeable_from_url
 from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
 from bzrlib.bundle.bundle_data import BundleTree
+from bzrlib.bzrdir import BzrDir
 from bzrlib.directory_service import directories
 from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
 from bzrlib.bundle.serializer.v08 import BundleSerializerV08
@@ -1598,6 +1598,8 @@
         sock_server = _DisconnectingTCPServer()
         sock_server.setUp()
         self.addCleanup(sock_server.tearDown)
+        # We don't really care what the url is since the server will close the
+        # connection without interpreting it
         url = sock_server.get_url()
         self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)