Merge lp:~vila/bzr/709104-windows-bash-completion into lp:bzr

[Vincent Ladeuil]

Mark test failures on windows as KnownFailures pending investigation.

This mark the failing tests as known failures.

Since this isn't a regression (the tests were previously skipped
but most probably never succeeded as mentioned in bug #709104), I
don't try to fix it now but restore sanity on babune.

[Martin Packman (gz)]

I don't see that presence of a cygwin bash should be making these tests work on windows. That said, KnownFailure is fine until someone has a chance to investigate further.

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/28/2011 5:27 AM, Martin [gz] wrote:
> Review: Approve
> I don't see that presence of a cygwin bash should be making these tests work on windows. That said, KnownFailure is fine until someone has a chance to investigate further.

There is a bash.exe in your path. We find it, and think we can use it.

I don't honestly know why it is failing, but maybe there are path
issues, or expectations that don't match. (Like trying to path
C:\\path\to\cwd rather than /cygdrive/c/path/to/cwd, etc.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1C3t8ACgkQJdeBCYSNAANJQwCffFp4r05LON20mZjibL6rLxRk
+PsAoMK9JK1XoZsNL9HjPdP1btQVAZ6U
=Ch82
-----END PGP SIGNATURE-----

=== modified file 'bzrlib/plugins/bash_completion/tests/test_bashcomp.py'
--- bzrlib/plugins/bash_completion/tests/test_bashcomp.py	2010-05-29 10:30:53 +0000
+++ bzrlib/plugins/bash_completion/tests/test_bashcomp.py	2011-01-28 10:55:15 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import sys
+
 import bzrlib
 from bzrlib import commands, tests
 from bzrlib.tests import features
@@ -27,6 +29,7 @@
     """Component for testing execution of a bash completion script."""
 
     _test_needs_features = [features.bash_feature]
+    script = None
 
     def complete(self, words, cword=-1):
         """Perform a bash completion.
@@ -95,10 +98,6 @@
 class TestBashCompletion(tests.TestCase, BashCompletionMixin):
     """Test bash completions that don't execute bzr."""
 
-    def __init__(self, methodName='testMethod'):
-        super(TestBashCompletion, self).__init__(methodName)
-        self.script = None
-
     def test_simple_scipt(self):
         """Ensure that the test harness works as expected"""
         self.script = """
@@ -155,9 +154,11 @@
     will be replaced by the bzr instance running this selftest.
     """
 
-    def __init__(self, methodName='testMethod'):
-        super(TestBashCompletionInvoking, self).__init__(methodName)
-        self.script = None
+    def setUp(self):
+        super(TestBashCompletionInvoking, self).setUp()
+        if sys.platform == 'win32':
+            raise tests.KnownFailure(
+                'see bug #709104, completion is broken on windows')
 
     def get_script(self):
         s = super(TestBashCompletionInvoking, self).get_script()