/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bad_files.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bad_files.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Tests being able to ignore bad filetypes."""
25
25
    errors,
26
26
    )
27
27
from bzrlib.status import show_tree_status
28
 
from bzrlib.tests import OsFifoFeature, TestCaseWithTransport
 
28
from bzrlib.tests import TestCaseWithTransport
29
29
 
30
30
 
31
31
def verify_status(tester, tree, value):
40
40
 
41
41
    def test_bad_files(self):
42
42
        """Test that bzr will ignore files it doesn't like"""
43
 
        self.requireFeature(OsFifoFeature)
 
43
        if getattr(os, 'mkfifo', None) is None:
 
44
            # TODO: Ultimately this should be TestSkipped
 
45
            # or PlatformDeficiency
 
46
            return
44
47
 
45
48
        wt = self.make_branch_and_tree('.')
46
49
        b = wt.branch
67
70
                           ])
68
71
 
69
72
        # We should raise an error if we are adding a bogus file
70
 
        self.assertRaises(errors.BadFileKindError, wt.smart_add, ['a-fifo'])
 
73
        self.assertRaises(errors.BadFileKindError,
 
74
                          add.smart_add_tree, wt, ['a-fifo'])
71
75
 
72
76
        # And the list of files shouldn't have been modified
73
77
        verify_status(self, wt,
78
82
 
79
83
        # Make sure smart_add can handle having a bogus
80
84
        # file in the way
81
 
        wt.smart_add([])
 
85
        add.smart_add_tree(wt, ['.'])
82
86
        verify_status(self, wt,
83
87
                          ['added:\n',
84
88
                           '  six\n',