Rev 2700: Harmonize run_bzr_subprocess with run_bzr calling conventions in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Aug 15 03:39:55 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2700
revision-id: pqm at pqm.ubuntu.com-20070815023951-yj66qy38vxjbdwrl
parent: pqm at pqm.ubuntu.com-20070815010819-0q50hsyvbvu1qs3k
parent: aaron.bentley at utoronto.ca-20070815011612-iq19p3hcbcuolmfm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-15 03:39:51 +0100
message:
Harmonize run_bzr_subprocess with run_bzr calling conventions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2665.4.4
merged: aaron.bentley at utoronto.ca-20070815011612-iq19p3hcbcuolmfm
parent: aaron.bentley at utoronto.ca-20070815011127-0il5s8oqmt26bma7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: run_external_fix
timestamp: Tue 2007-08-14 21:16:12 -0400
message:
Update deprecation symbols
------------------------------------------------------------
revno: 2665.4.3
merged: aaron.bentley at utoronto.ca-20070815011127-0il5s8oqmt26bma7
parent: abentley at panoramicfeedback.com-20070807185157-o9rnzwwsdoysokg0
parent: pqm at pqm.ubuntu.com-20070815010819-0q50hsyvbvu1qs3k
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: run_external_fix
timestamp: Tue 2007-08-14 21:11:27 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2665.4.2
merged: abentley at panoramicfeedback.com-20070807185157-o9rnzwwsdoysokg0
parent: aaron.bentley at utoronto.ca-20070803025223-u0dfa0rwptw0gxy2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: run_external_fix
timestamp: Tue 2007-08-07 14:51:57 -0400
message:
Update from review
------------------------------------------------------------
revno: 2665.4.1
merged: aaron.bentley at utoronto.ca-20070803025223-u0dfa0rwptw0gxy2
parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: run_external_fix
timestamp: Thu 2007-08-02 22:52:23 -0400
message:
teach run_bzr_subprocess to accept either a list of strings or a string
=== modified file 'NEWS'
--- a/NEWS 2007-08-14 23:38:03 +0000
+++ b/NEWS 2007-08-15 01:11:27 +0000
@@ -270,6 +270,10 @@
* The SSH_AUTH_SOCK environment variable is now reset to avoid
interaction with any running ssh agents. (Jelmer Vernooij, #125955)
+ * run_bzr_subprocess handles parameters the same way as run_bzr:
+ either a string or a list of strings should be passed as the first
+ parameter. Varargs-style parameters are deprecated. (Aaron Bentley)
+
bzr 0.18 2007-07-17
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2007-08-09 05:56:20 +0000
+++ b/bzrlib/tests/__init__.py 2007-08-15 01:16:12 +0000
@@ -80,6 +80,7 @@
from bzrlib.symbol_versioning import (
deprecated_method,
zero_eighteen,
+ zero_ninetyone,
)
import bzrlib.trace
from bzrlib.transport import get_transport
@@ -1433,6 +1434,15 @@
env_changes = kwargs.get('env_changes', {})
working_dir = kwargs.get('working_dir', None)
allow_plugins = kwargs.get('allow_plugins', False)
+ if len(args) == 1:
+ if isinstance(args[0], list):
+ args = args[0]
+ elif isinstance(args[0], basestring):
+ args = list(shlex.split(args[0]))
+ else:
+ symbol_versioning.warn(zero_ninetyone %
+ "passing varargs to run_bzr_subprocess",
+ DeprecationWarning, stacklevel=3)
process = self.start_bzr_subprocess(args, env_changes=env_changes,
working_dir=working_dir,
allow_plugins=allow_plugins)
=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- a/bzrlib/tests/blackbox/test_cat.py 2007-06-26 20:32:49 +0000
+++ b/bzrlib/tests/blackbox/test_cat.py 2007-08-03 02:52:23 +0000
@@ -28,7 +28,7 @@
def test_cat(self):
def bzr(*args, **kwargs):
- return self.run_bzr_subprocess(*args, **kwargs)[0]
+ return self.run_bzr_subprocess(list(args), **kwargs)[0]
os.mkdir('branch')
os.chdir('branch')
=== modified file 'bzrlib/tests/blackbox/test_debug.py'
--- a/bzrlib/tests/blackbox/test_debug.py 2007-07-05 00:12:25 +0000
+++ b/bzrlib/tests/blackbox/test_debug.py 2007-08-03 02:52:23 +0000
@@ -18,7 +18,6 @@
import os
import signal
-import subprocess
import sys
import time
=== modified file 'bzrlib/tests/blackbox/test_diff.py'
--- a/bzrlib/tests/blackbox/test_diff.py 2007-07-04 08:49:15 +0000
+++ b/bzrlib/tests/blackbox/test_diff.py 2007-08-03 02:52:23 +0000
@@ -282,8 +282,7 @@
orig_progress = os.environ.get('BZR_PROGRESS_BAR')
try:
os.environ['BZR_PROGRESS_BAR'] = 'none'
- out, err = self.run_bzr_subprocess('diff', '-r', '1',
- '--diff-options', '-ub',
+ out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
universal_newlines=True,
retcode=None)
finally:
=== modified file 'bzrlib/tests/blackbox/test_locale.py'
--- a/bzrlib/tests/blackbox/test_locale.py 2006-10-11 23:08:27 +0000
+++ b/bzrlib/tests/blackbox/test_locale.py 2007-08-03 02:52:23 +0000
@@ -41,8 +41,8 @@
self.tree = tree
def test_log_C(self):
- out, err = self.run_bzr_subprocess('--no-aliases', '--no-plugins',
- '-q', 'log', '--log-format=long', 'tree',
+ out, err = self.run_bzr_subprocess(
+ '--no-aliases --no-plugins -q log --log-format=long tree',
env_changes={'LANG':'C', 'BZR_PROGRESS_BAR':'none',
'LC_ALL':None, 'LC_CTYPE':None, 'LANGUAGE':None})
self.assertEqual('', err)
@@ -57,8 +57,8 @@
""", out)
def test_log_BOGUS(self):
- out, err = self.run_bzr_subprocess('--no-aliases', '--no-plugins',
- '-q', 'log', '--log-format=long', 'tree',
+ out, err = self.run_bzr_subprocess(
+ '--no-aliases --no-plugins -q log --log-format=long tree',
env_changes={'LANG':'BOGUS', 'BZR_PROGRESS_BAR':'none',
'LC_ALL':None, 'LC_CTYPE':None, 'LANGUAGE':None})
# XXX: This depends on the exact formatting of a locale.Error
=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py 2007-08-01 08:59:40 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py 2007-08-15 01:16:12 +0000
@@ -270,6 +270,7 @@
def test_run_bzr_subprocess(self):
"""The run_bzr_helper_external comand behaves nicely."""
result = self.run_bzr_subprocess('--version')
+ result = self.run_bzr_subprocess(['--version'])
result = self.run_bzr_subprocess('--version', retcode=None)
self.assertContainsRe(result[0], 'is free software')
self.assertRaises(AssertionError, self.run_bzr_subprocess,
@@ -277,10 +278,14 @@
result = self.run_bzr_subprocess('--versionn', retcode=3)
result = self.run_bzr_subprocess('--versionn', retcode=None)
self.assertContainsRe(result[1], 'unknown command')
- err = self.run_bzr_subprocess('merge', '--merge-type', 'magic merge',
- retcode=3)[1]
+ err = self.run_bzr_subprocess(['merge', '--merge-type',
+ 'magic merge'], retcode=3)[1]
self.assertContainsRe(err, 'Bad value "magic merge" for option'
' "merge-type"')
+ self.callDeprecated(['passing varargs to run_bzr_subprocess was'
+ ' deprecated in version 0.91.'],
+ self.run_bzr_subprocess,
+ 'arg1', 'arg2', 'arg3', retcode=3)
def test_run_bzr_subprocess_env(self):
"""run_bzr_subprocess can set environment variables in the child only.
@@ -392,7 +397,7 @@
raise _DontSpawnProcess()
def test_run_bzr_subprocess_no_plugins(self):
- self.assertRaises(_DontSpawnProcess, self.run_bzr_subprocess)
+ self.assertRaises(_DontSpawnProcess, self.run_bzr_subprocess, '')
command = self._popen_args[0]
self.assertEqual(sys.executable, command[0])
self.assertEqual(self.get_bzr_path(), command[1])
@@ -400,7 +405,7 @@
def test_allow_plugins(self):
self.assertRaises(_DontSpawnProcess,
- self.run_bzr_subprocess, allow_plugins=True)
+ self.run_bzr_subprocess, '', allow_plugins=True)
command = self._popen_args[0]
self.assertEqual([], command[2:])
=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py 2007-08-09 04:54:42 +0000
+++ b/bzrlib/tests/blackbox/test_send.py 2007-08-15 01:11:27 +0000
@@ -116,7 +116,7 @@
# which would break patch-based bundles
self.make_trees()
os.chdir('branch')
- stdout = self.run_bzr_subprocess('send', '-o-')[0]
+ stdout = self.run_bzr_subprocess('send -o-')[0]
br = read_bundle(StringIO(stdout))
self.assertRevisions(br, ['revision3'])
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py 2007-07-20 18:59:29 +0000
+++ b/bzrlib/tests/test_sftp_transport.py 2007-08-03 02:52:23 +0000
@@ -334,7 +334,7 @@
# else:
# self.fail('Excepted ConnectionError to be raised')
- out, err = self.run_bzr_subprocess('log', self.bogus_url, retcode=3)
+ out, err = self.run_bzr_subprocess(['log', self.bogus_url], retcode=3)
self.assertEqual('', out)
if "NameError: global name 'SSHException'" in err:
# We aren't fixing this bug, because it is a bug in
More information about the bazaar-commits
mailing list