/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/blackbox/test_whoami.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/blackbox/test_whoami.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
"""Black-box tests for bzr whoami."""
32
32
        self.assertTrue(len(out) > 0)
33
33
        self.assertEquals(1, out.count('@'))
34
34
 
35
 
        out = self.run_bzr("whoami --email")[0]
 
35
        out = self.run_bzr("whoami", "--email")[0]
36
36
        self.assertTrue(len(out) > 0)
37
37
        self.assertEquals(1, out.count('@'))
38
 
 
 
38
        
39
39
    def test_whoami_branch(self):
40
40
        """branch specific user identity works."""
41
41
        wt = self.make_branch_and_tree('.')
45
45
        bzr_email = os.environ.get('BZR_EMAIL')
46
46
        if bzr_email is not None:
47
47
            del os.environ['BZR_EMAIL']
 
48
        bzremail = os.environ.get('BZREMAIL')
 
49
        if bzremail is not None:
 
50
            del os.environ['BZREMAIL']
48
51
        try:
49
52
            whoami = self.run_bzr("whoami")[0]
50
53
            self.assertEquals('Branch Identity <branch@identi.ty>\n', whoami)
51
 
            whoami_email = self.run_bzr("whoami --email")[0]
 
54
            whoami_email = self.run_bzr("whoami", "--email")[0]
52
55
            self.assertEquals('branch@identi.ty\n', whoami_email)
53
56
 
54
 
            # Verify that the environment variable overrides the value
 
57
            # Verify that the environment variable overrides the value 
55
58
            # in the file
56
59
            os.environ['BZR_EMAIL'] = 'Different ID <other@environ.ment>'
57
60
            whoami = self.run_bzr("whoami")[0]
58
61
            self.assertEquals('Different ID <other@environ.ment>\n', whoami)
59
 
            whoami_email = self.run_bzr("whoami --email")[0]
 
62
            whoami_email = self.run_bzr("whoami", "--email")[0]
60
63
            self.assertEquals('other@environ.ment\n', whoami_email)
61
64
            del os.environ['BZR_EMAIL']
 
65
            os.environ['BZREMAIL'] = 'Yet Another ID <yetother@environ.ment>'
 
66
            whoami, warn = self.run_bzr("whoami")
 
67
            self.assertEquals('Yet Another ID <yetother@environ.ment>\n', whoami)
 
68
            self.assertTrue(len(warn) > 0)
 
69
            del os.environ['BZREMAIL']
62
70
        finally:
63
71
            if bzr_email is not None:
64
72
                os.environ['BZR_EMAIL'] = bzr_email
 
73
            if bzremail is not None:
 
74
                os.environ['BZREMAIL'] = bzremail
65
75
 
66
76
    def test_whoami_utf8(self):
67
77
        """verify that an identity can be in utf-8."""
68
78
        wt = self.make_branch_and_tree('.')
69
 
        self.run_bzr(['whoami', u'Branch Identity \u20ac <branch@identi.ty>'],
 
79
        self.run_bzr('whoami', u'Branch Identity \u20ac <branch@identi.ty>',
70
80
                     encoding='utf-8')
71
81
        bzr_email = os.environ.get('BZR_EMAIL')
72
82
        if bzr_email is not None:
75
85
            whoami = self.run_bzr("whoami", encoding='utf-8')[0]
76
86
            self.assertEquals('Branch Identity \xe2\x82\xac ' +
77
87
                              '<branch@identi.ty>\n', whoami)
78
 
            whoami_email = self.run_bzr("whoami --email",
 
88
            whoami_email = self.run_bzr("whoami", "--email",
79
89
                                        encoding='utf-8')[0]
80
90
            self.assertEquals('branch@identi.ty\n', whoami_email)
81
91
        finally:
97
107
        try:
98
108
            whoami = self.run_bzr("whoami", encoding='ascii')[0]
99
109
            self.assertEquals('Branch Identity ? <branch@identi.ty>\n', whoami)
100
 
            whoami_email = self.run_bzr("whoami --email",
 
110
            whoami_email = self.run_bzr("whoami", "--email",
101
111
                                        encoding='ascii')[0]
102
112
            self.assertEquals('branch@identi.ty\n', whoami_email)
103
113
        finally:
107
117
    def test_warning(self):
108
118
        """verify that a warning is displayed if no email is given."""
109
119
        self.make_branch_and_tree('.')
110
 
        display = self.run_bzr(['whoami', 'Branch Identity'])[1]
 
120
        display = self.run_bzr('whoami', 'Branch Identity')[1]
111
121
        self.assertEquals('"Branch Identity" does not seem to contain an '
112
122
                          'email address.  This is allowed, but not '
113
123
                          'recommended.\n', display)