Merge lp:~vila/bzr/430749-no-extensions-warning into lp:bzr

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

This patch fixes the failures encountered when running the test suite without the C extensions built.

I chose to modify the tests that were expecting a clean stderr (or some expected stderr) because
they were only a few of them.

An alternative would have been to force the config variable in the test base class
but I thought it was too big a hammer.

[Robert Collins (lifeless)]

Perhaps it would be clearer and simpler to add a method to TestCase:

self.disable_missing_extensions_warning()

?

[Matthew Fuller (fullermd)]

> I chose to modify the tests that were expecting a clean stderr (or
> some expected stderr) because they were only a few of them.

This makes me a little nervous, in that it adds a new undocumented
rule about what you need to do if you care about stderr when writing a
test (and since pretty much anybody writing a test probably HAS
extensions, they'll never notice it either).

[Martin Pool (mbp)]

2009/9/18 fullermd <email address hidden>:
>> I chose to modify the tests that were expecting a clean stderr (or
>> some expected stderr) because they were only a few of them.
>
> This makes me a little nervous, in that it adds a new undocumented
> rule about what you need to do if you care about stderr when writing a
> test (and since pretty much anybody writing a test probably HAS
> extensions, they'll never notice it either).

It does seem a bit hacky.

--
Martin <http://launchpad.net/~mbp/>

[John A Meinel (jameinel)]

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

Martin Pool wrote:
> 2009/9/18 fullermd <email address hidden>:
>>> I chose to modify the tests that were expecting a clean stderr (or
>>> some expected stderr) because they were only a few of them.
>> This makes me a little nervous, in that it adds a new undocumented
>> rule about what you need to do if you care about stderr when writing a
>> test (and since pretty much anybody writing a test probably HAS
>> extensions, they'll never notice it either).
>
> It does seem a bit hacky.
>

Though arguably this is why I asked Vincent to run the test suite on a
buildbot with extensions disabled... :)

John
=:->

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

iEYEARECAAYFAkq0P9QACgkQJdeBCYSNAAORMgCfT/dBFDj17+iDIW9wluK23U1T
ebsAninoVjFBVR0d22HoQ8B8o/KR7iEc
=4xsA
-----END PGP SIGNATURE-----

=== modified file 'NEWS'
--- NEWS	2009-09-16 10:29:18 +0000
+++ NEWS	2009-09-17 07:09:01 +0000
@@ -125,6 +125,8 @@
   to be parameterised. This is not expected to break external use of test
   parameterisation, and is substantially faster. (Robert Collins)
 
+* The full test suite is expected to pass when the C extensions are not
+  present. (Vincent Ladeuil, #430749)
 
 bzr 2.0rc2
 ##########
 
=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- bzrlib/tests/blackbox/test_cat.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_cat.py	2009-09-17 07:09:01 +0000
@@ -22,9 +22,13 @@
 import os
 import sys
 
-from bzrlib.tests.blackbox import TestCaseWithTransport
-
-class TestCat(TestCaseWithTransport):
+from bzrlib import (
+    config,
+    tests,
+    )
+
+
+class TestCat(tests.TestCaseWithTransport):
 
     def test_cat(self):
         tree = self.make_branch_and_tree('branch')
@@ -68,6 +72,7 @@
 
     def test_cat_different_id(self):
         """'cat' works with old and new files"""
+        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
         tree = self.make_branch_and_tree('.')
         # the files are named after their path in the revision and
         # current trees later in the test case
 
=== modified file 'bzrlib/tests/blackbox/test_diff.py'
--- bzrlib/tests/blackbox/test_diff.py	2009-06-17 05:11:41 +0000
+++ bzrlib/tests/blackbox/test_diff.py	2009-09-17 07:09:01 +0000
@@ -21,11 +21,11 @@
 import os
 import re
 
-import bzrlib
-from bzrlib import workingtree
-from bzrlib.branch import Branch
-from bzrlib.tests import TestSkipped
-from bzrlib.tests.blackbox import ExternalBase
+from bzrlib import (
+    config,
+    tests,
+    workingtree,
+    )
 
 
 def subst_dates(string):
@@ -34,7 +34,7 @@
                   'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
 
 
-class DiffBase(ExternalBase):
+class DiffBase(tests.TestCaseWithTransport):
     """Base class with common setup method"""
 
     def make_example_branch(self):
@@ -355,6 +355,7 @@
 
     def test_external_diff(self):
         """Test that we can spawn an external diff process"""
+        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
         # We have to use run_bzr_subprocess, because we need to
         # test writing directly to stdout, (there was a bug in
         # subprocess.py that we had to workaround).
@@ -366,7 +367,7 @@
                                            universal_newlines=True,
                                            retcode=None)
         if 'Diff is not installed on this machine' in err:
-            raise TestSkipped("No external 'diff' is available")
+            raise tests.TestSkipped("No external 'diff' is available")
         self.assertEqual('', err)
         # We have to skip the stuff in the middle, because it depends
         # on time.time()
 
=== modified file 'bzrlib/tests/blackbox/test_locale.py'
--- bzrlib/tests/blackbox/test_locale.py	2009-08-17 22:16:49 +0000
+++ bzrlib/tests/blackbox/test_locale.py	2009-09-17 07:09:01 +0000
@@ -19,17 +19,20 @@
 import os
 import sys
 
-from bzrlib.tests import TestCaseWithTransport, TestSkipped
-
-
-class TestLocale(TestCaseWithTransport):
+from bzrlib import (
+    config,
+    tests,
+    )
+
+
+class TestLocale(tests.TestCaseWithTransport):
 
     def setUp(self):
         super(TestLocale, self).setUp()
 
         if sys.platform in ('win32',):
-            raise TestSkipped('Windows does not respond to the LANG'
-                              ' env variable')
+            raise tests.TestSkipped('Windows does not respond to the LANG'
+                                    ' env variable')
 
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a'])
@@ -41,6 +44,7 @@
         self.tree = tree
 
     def test_log_C(self):
+        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
         out, err = self.run_bzr_subprocess(
             '--no-aliases --no-plugins log -q --log-format=long tree',
                env_changes={'LANG':'C', 'BZR_PROGRESS_BAR':'none',
 
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- bzrlib/tests/blackbox/test_serve.py	2009-09-08 03:31:31 +0000
+++ bzrlib/tests/blackbox/test_serve.py	2009-09-17 07:09:01 +0000
@@ -25,6 +25,7 @@
 import threading
 
 from bzrlib import (
+    config,
     errors,
     osutils,
     revision as _mod_revision,
@@ -42,6 +43,10 @@
 
 class TestBzrServe(TestCaseWithTransport):
 
+    def setUp(self):
+        super(TestBzrServe, self).setUp()
+        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
+
     def assertInetServerShutsdownCleanly(self, process):
         """Shutdown the server process looking for errors."""
         # Shutdown the server: the server should shut down when it cannot read
 
=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2009-09-09 15:27:48 +0000
+++ bzrlib/tests/test_selftest.py	2009-09-17 07:09:01 +0000
@@ -28,6 +28,7 @@
 from bzrlib import (
     branchbuilder,
     bzrdir,
+    config,
     debug,
     errors,
     lockdir,
@@ -2369,6 +2370,7 @@
         """finish_bzr_subprocess raises self.failureException if the retcode is
         not the expected one.
         """
+        config.GlobalConfig().set_user_option('ignore_missing_extensions', True)
         process = self.start_bzr_subprocess(['wait-until-signalled'],
                                             skip_if_plan_to_signal=True)
         self.assertEqual('running\n', process.stdout.readline())