Skip to content

Commit

Permalink
Verbose command didn't propery add/remove the ?error_trace http param
Browse files Browse the repository at this point in the history
  • Loading branch information
matriv committed Jul 24, 2017
1 parent 681ed9a commit a4f3981
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Changes for crash
Unreleased
==========

- Fixed: ``\verbose`` command didn't not switch on verbosity if ``crash`` was
launched without the ```--verbose` flag.

2017/07/11 0.21.3
=================

Expand Down
12 changes: 8 additions & 4 deletions src/crate/crash/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,16 @@ def is_conn_avaliable(self):
else:
return True

def _do_connect(self):
self.connection = connect(servers=self.last_connected_servers, error_trace=self.error_trace,
verify_ssl_cert=self.verify_ssl, cert_file=self.cert_file, key_file=self.key_file,
ca_cert=self.ca_cert_file, username=self.username)
self.cursor = self.connection.cursor()

def _connect(self, server):
""" connect to the given server, e.g.: \connect localhost:4200 """
self.connection = connect(servers=server, error_trace=self.error_trace, verify_ssl_cert=self.verify_ssl,
cert_file=self.cert_file, key_file=self.key_file, ca_cert=self.ca_cert_file,
username=self.username)
self.cursor = self.connection.cursor()
self.last_connected_servers = server
self._do_connect()
results = []
failed = 0
client = self.connection.client
Expand Down
1 change: 1 addition & 0 deletions src/crate/crash/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class ToggleVerboseCommand(Command):
@noargs_command
def __call__(self, cmd, *args, **kwargs):
cmd.error_trace = not cmd.error_trace
cmd._do_connect()
return 'Verbose {0}'.format(
cmd.error_trace and 'ON' or 'OFF'
)
Expand Down
4 changes: 4 additions & 0 deletions src/crate/crash/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,12 @@ def test_toggle_output(self, fake_cmd):
command = ToggleVerboseCommand()
output = command(fake_cmd)
self.assertEqual(output, 'Verbose OFF')
fake_cmd._do_connect.assert_called_once()

fake_cmd.reset_mock()
output = command(fake_cmd)
self.assertEqual(output, 'Verbose ON')
fake_cmd._do_connect.assert_called_once()


class ShowTablesCommandTest(TestCase):
Expand Down

0 comments on commit a4f3981

Please sign in to comment.