/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_generate_ids.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_generate_ids.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
"""Tests for bzrlib/generate_ids.py"""
18
18
 
52
52
        self.assertStartsWith(gen_file_id('..gam.py'), 'gam.py-')
53
53
        self.assertStartsWith(gen_file_id('..Mwoo oof\t m'), 'mwoooofm-')
54
54
 
55
 
        # we remove unicode characters, and still don't end up with a
 
55
        # we remove unicode characters, and still don't end up with a 
56
56
        # hidden file id
57
57
        self.assertStartsWith(gen_file_id(u'\xe5\xb5.txt'), 'txt-')
58
58
 
112
112
class TestGenRevisionId(tests.TestCase):
113
113
    """Test generating revision ids"""
114
114
 
 
115
    def assertMatchesRe(self, regex, text):
 
116
        """Make sure text is matched by the regex given"""
 
117
        if re.match(regex, text) is None:
 
118
            self.fail('Pattern %s did not match text %s' % (regex, text))
 
119
 
115
120
    def assertGenRevisionId(self, regex, username, timestamp=None):
116
121
        """gen_revision_id should create a revision id matching the regex"""
117
122
        revision_id = generate_ids.gen_revision_id(username, timestamp)
118
 
        self.assertContainsRe(revision_id, '^'+regex+'$')
 
123
        self.assertMatchesRe(regex, revision_id)
119
124
        # It should be a utf8 revision_id, not a unicode one
120
125
        self.assertIsInstance(revision_id, str)
121
126
        # gen_revision_id should always return ascii revision ids.