Rev 5398: (vila, jam) Get PQM running correctly again (bug #626667), in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5398 [merge]
revision-id: pqm at pqm.ubuntu.com-20100830224920-w9zw1vhsd5oiyljv
parent: pqm at pqm.ubuntu.com-20100830143652-e1ji3zh62t50lujb
parent: john at arbash-meinel.com-20100830212750-8vql1h95b0rp52o5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-08-30 23:49:20 +0100
message:
  (vila, jam) Get PQM running correctly again (bug #626667),
  	skip test_bzr_connect_to_bzr_ssh (bug #626876)
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
=== modified file 'Makefile'
--- a/Makefile	2010-04-06 06:59:03 +0000
+++ b/Makefile	2010-08-30 21:23:49 +0000
@@ -39,8 +39,14 @@
 check: docs check-nodocs
 
 check-nodocs: extensions
+	set -e
 	# Generate a stream for PQM to watch.
+	-$(RM) -f selftest.log
 	$(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
+	# An empty log file should catch errors in the $(PYTHON)
+	# command above (the '|' swallow any errors since 'make'
+	# sees the 'tee' exit code for the whole line
+	if [ ! -s selftest.log ] ; then exit 1 ; fi
 	# Check that there were no errors reported.
 	subunit-stats < selftest.log
 

=== modified file 'NEWS'
--- a/NEWS	2010-08-30 07:47:38 +0000
+++ b/NEWS	2010-08-30 10:14:21 +0000
@@ -128,6 +128,9 @@
 * `PathNotChild` should not give a traceback.
   (Martin Pool, #98735)
 
+* ``PQM`` will no longer ignore syntax errors in submissions.
+  (Vincent Ladeuil, #626667)
+
 * Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
   which can result in "missing referenced chk root keys" errors when
   fetching from repositories with affected revisions.

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2010-08-29 14:32:45 +0000
+++ b/bzrlib/tests/test_config.py	2010-08-30 08:26:45 +0000
@@ -491,7 +491,8 @@
         return self.config_class(*self.config_args)
 
     def create_config(self, content):
-        c = self.config_class.from_string(content, *self.config_args, save=True)
+        kwargs = dict(save=True)
+        c = self.config_class.from_string(content, *self.config_args, **kwargs)
         return c
 
     def test_simple_read_access(self):

=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py	2010-06-23 16:05:14 +0000
+++ b/bzrlib/tests/test_transport.py	2010-08-30 21:27:50 +0000
@@ -900,6 +900,8 @@
 
         bzr+ssh:// should cause bzr to run a remote bzr smart server over SSH.
         """
+        raise tests.TestSkipped('this test was recently broken,'
+                                ' see bug #626876')
         # This test actually causes a bzr instance to be invoked, which is very
         # expensive: it should be the only such test in the test suite.
         # A reasonable evolution for this would be to simply check inside