mirror of
https://github.com/django/django.git
synced 2025-10-17 13:58:24 +00:00
Fixed #29501 -- Allowed dbshell to pass options to underlying tool.
This commit is contained in:
parent
8e8c3f964e
commit
5b884d45ac
13 changed files with 117 additions and 21 deletions
|
@ -8,17 +8,19 @@ from django.test import SimpleTestCase
|
|||
|
||||
@skipUnless(connection.vendor == 'oracle', 'Oracle tests')
|
||||
class OracleDbshellTests(SimpleTestCase):
|
||||
def _run_dbshell(self, rlwrap=False):
|
||||
def _run_dbshell(self, rlwrap=False, parameters=None):
|
||||
"""Run runshell command and capture its arguments."""
|
||||
def _mock_subprocess_run(*args, **kwargs):
|
||||
self.subprocess_args = list(*args)
|
||||
return CompletedProcess(self.subprocess_args, 0)
|
||||
|
||||
if parameters is None:
|
||||
parameters = []
|
||||
client = DatabaseClient(connection)
|
||||
self.subprocess_args = None
|
||||
with mock.patch('subprocess.run', new=_mock_subprocess_run):
|
||||
with mock.patch('shutil.which', return_value='/usr/bin/rlwrap' if rlwrap else None):
|
||||
client.runshell()
|
||||
client.runshell(parameters)
|
||||
return self.subprocess_args
|
||||
|
||||
def test_without_rlwrap(self):
|
||||
|
@ -32,3 +34,9 @@ class OracleDbshellTests(SimpleTestCase):
|
|||
self._run_dbshell(rlwrap=True),
|
||||
['/usr/bin/rlwrap', 'sqlplus', '-L', connection._connect_string()],
|
||||
)
|
||||
|
||||
def test_parameters(self):
|
||||
self.assertEqual(
|
||||
self._run_dbshell(parameters=['-HELP']),
|
||||
['sqlplus', '-L', connection._connect_string(), '-HELP'],
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue