Merge lp:~vila/bzr/1233413-netrc into lp:bzr

[Vincent Ladeuil]

Make .netrc 0600 in tests so python-2.7.5-8's netrc is happy.

See bug report for details, in a nutshell, starting with python-2.7.5-8, the
netrc module checks ~/.netrc permissions.

This leads to test failures as tests create it with default
permissions. Restricting to 0600 is enough to fix.

[Jelmer Vernooij (jelmer)]

Won't this break Windows?

[Andrew Starr-Bochicchio (andrewsomething)]

I had tried to fix this using bzrlib's osutils.chmod_if_possible which should be Windows safe AFAIK, but for some reason it doesn't seem to work for me.

[Vincent Ladeuil (vila)]

> Won't this break Windows?

.netrc on windows ? Well, nothing in the tests say that won't run on windows so I can fix that.

Still working here with chmod_if_possible (see

> I had tried to fix this using bzrlib's osutils.chmod_if_possible which should be Windows safe AFAIK, but for some reason it doesn't seem to work for me.

Weird, can you try my fix and confirms it works for you ?

[Andrew Starr-Bochicchio (andrewsomething)]

I can confirm that your branch works as expected. (Not sure what I did wrong? I guess must have done something stupid as it was such an obvious fix...)

review: Approve

[Vincent Ladeuil (vila)]

@Andrew: Thanks ! Yeah, should have been something obscure or testing the wrong thing may be ?

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/plugins/netrc_credential_store/tests/test_netrc.py'
--- bzrlib/plugins/netrc_credential_store/tests/test_netrc.py	2009-03-23 14:59:43 +0000
+++ bzrlib/plugins/netrc_credential_store/tests/test_netrc.py	2013-10-01 16:36:45 +0000
@@ -43,11 +43,12 @@
 machine host login joe password secret
 default login anonymous password joe@home
 """
-        f = open(osutils.pathjoin(self.test_home_dir, '.netrc'), 'wb')
-        try:
+        netrc_path = osutils.pathjoin(self.test_home_dir, '.netrc')
+        with open(netrc_path, 'wb') as f:
             f.write(netrc_content)
-        finally:
-            f.close()
+        # python's netrc will complain about access permissions starting with
+        # 2.7.5-8 so we restrict the access unconditionally
+        osutils.chmod_if_possible(netrc_path, 0600)
 
     def _get_netrc_cs(self):
         return  config.credential_store_registry.get_credential_store('netrc')

=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- doc/en/release-notes/bzr-2.7.txt	2013-07-27 12:53:28 +0000
+++ doc/en/release-notes/bzr-2.7.txt	2013-10-01 16:36:45 +0000
@@ -56,6 +56,8 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* Restrict access to '.netrc' in tests or recent python (2.7.5-8) will
+  complain. (Vincent Ladeuil, #1233413)
 
 ..
    vim: tw=74 ft=rst ff=unix