Merge lp:~mbp/bzr/659763-non-ascii-gecos into lp:bzr/2.3
Status: | Superseded |
---|---|
Proposed branch: | lp:~mbp/bzr/659763-non-ascii-gecos |
Merge into: | lp:bzr/2.3 |
Diff against target: |
267 lines (+168/-8) 5 files modified
bzrlib/config.py (+92/-5) bzrlib/tests/features.py (+1/-0) bzrlib/tests/fixtures.py (+12/-0) bzrlib/tests/test_config.py (+49/-0) doc/en/release-notes/bzr-2.3.txt (+14/-3) |
To merge this branch: | bzr merge lp:~mbp/bzr/659763-non-ascii-gecos |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+55862@code.launchpad.net |
This proposal has been superseded by a proposal from 2011-04-11.
Commit message
Add a test for decoding on non-ascii GECOS entries; Fix mis-imported mutter statements.
Description of the change
vila was right that my fix <https:/
Unmerged revisions
- 5125. By Martin Pool
-
Add a test for decoding on non-ascii GECOS entries.
Separate out get_user_
name_from_ os so that it can be tested in isolation. Fix mis-imported mutter statements.
Add static sampledata into bzrlib.
tests.fixtures.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 4/1/2011 6:04 AM, Martin Pool wrote: mSmartServer" /bugs.launchpad .net/bzr/ +bug/659763 /code.launchpad .net/~mbp/ bzr/659763- non-ascii- gecos/+ merge/55862 /code.launchpad .net/~mbp/ bzr/whoami/ +merge/ 55679> also fixed bug 659763. This adds a test for it, cleans up the code a bit, and fixes some (apparently previously untested) broken mutter statements. Because of the last point I think this should go into 2.3 too.
> Martin Pool has proposed merging lp:~mbp/bzr/659763-non-ascii-gecos into lp:bzr/2.3.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #659763 in Bazaar: "bzr smart server can't handle UTF-8 user names, gives UnknownErrorFro
> https:/
>
> For more details, see:
> https:/
>
> vila was right that my fix <https:/
> + def test_auto_ user_id( self):
> + """Automatic inference of user name.
> +
> + This is a bit hard to test in an isolated way, because it depends on
> + system functions that go direct to /etc or perhaps somewhere else.
> + But it's reasonable to say that on Unix, with an /etc/mailname, we ought
> + to be able to choose a user name with no configuration.
> + """
> + if sys.platform == 'win32':
> + raise TestSkipped("User name inference not implemented on win32")
This looks more like a missing feature than just a test skipped. (as in,
we don't yet support the feature on windows, or some such).
Off-hand I'm thinking we could use the MAPI support to get an email, and
the username is usually pretty easy to get. Though I don't know it offhand.
> + def test_get_ user_name_ from_os_ smoke(self) : user_name_ from_pwd may not work but it must not crash.""" get_user_ name_from_ os() stance( realname, (basestring, type(None))) stance( local_username, (basestring, type(None)))
> + """get_
> + realname, local_username = config.
> + self.assertIsIn
> + self.assertIsIn
> +
^- shouldn't these always be Unicode or None ?
Otherwise looks good to me.
merge: approve
John
=:->
-----BEGIN PGP SIGNATURE----- enigmail. mozdev. org/
ViK8ACgkQJdeBCY SNAAP75gCgm5oAG hBjrnksh78XgJ3l 1qna gXrfgwtQTYQVr7A jR
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk2
39sAn37HIwKPvSV
=GW8X
-----END PGP SIGNATURE-----