Rev 2672: (robertc) Merge Michael Hudson's run_bzr keyword usage fix. (Michael Hudson) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2672
revision-id: pqm at pqm.ubuntu.com-20070806023139-97nrt9mu4qihcdf3
parent: pqm at pqm.ubuntu.com-20070803043116-l7u1uypblmx1uxnr
parent: michael.hudson at canonical.com-20070801153837-ytpslegafe8jga9d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-08-06 03:31:39 +0100
message:
  (robertc) Merge Michael Hudson's run_bzr keyword usage fix. (Michael Hudson)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
    ------------------------------------------------------------
    revno: 2665.1.2
    merged: michael.hudson at canonical.com-20070801153837-ytpslegafe8jga9d
    parent: michael.hudson at canonical.com-20070801085940-940rk4rh3n0hzh1a
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: stricter-run_bzr
    timestamp: Wed 2007-08-01 16:38:37 +0100
    message:
      as jam suggested, report all extra keywords
    ------------------------------------------------------------
    revno: 2665.1.1
    merged: michael.hudson at canonical.com-20070801085940-940rk4rh3n0hzh1a
    parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: stricter-run_bzr
    timestamp: Wed 2007-08-01 09:59:40 +0100
    message:
      make run_bzr stricter about the keyword arguments it takes.
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-07-27 06:15:32 +0000
+++ b/bzrlib/tests/__init__.py	2007-08-01 15:38:37 +0000
@@ -1345,6 +1345,10 @@
         working_dir = kwargs.pop('working_dir', None)
         error_regexes = kwargs.pop('error_regexes', [])
 
+        if kwargs:
+            raise TypeError("run_bzr() got unexpected keyword arguments '%s'"
+                            % kwargs.keys())
+
         if len(args) == 1:
             if isinstance(args[0], (list, basestring)):
                 args = args[0]
@@ -1386,12 +1390,12 @@
 
             # Make sure that commit is failing because there is nothing to do
             self.run_bzr_error(['no changes to commit'],
-                               'commit', '-m', 'my commit comment')
+                               ['commit', '-m', 'my commit comment'])
             # Make sure --strict is handling an unknown file, rather than
             # giving us the 'nothing to do' error
             self.build_tree(['unknown'])
             self.run_bzr_error(['Commit refused because there are unknown files'],
-                               'commit', '--strict', '-m', 'my commit comment')
+                               ['commit', --strict', '-m', 'my commit comment'])
         """
         kwargs.setdefault('retcode', 3)
         kwargs['error_regexes'] = error_regexes

=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py	2007-07-11 01:44:46 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py	2007-08-01 08:59:40 +0000
@@ -172,6 +172,10 @@
         self.assertEqual('baz', self.working_dir)
         self.assertEqual(['foo', 'bar'], self.argv)
 
+    def test_reject_extra_keyword_arguments(self):
+        self.assertRaises(TypeError, self.run_bzr, "foo bar",
+                          error_regex=['error message'])
+
 
 class TestBenchmarkTests(TestCaseWithTransport):