Skip to content
Snippets Groups Projects
Commit 666fb74f authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Test-runner: update the 'tarantool' command line client.

Update the command line client with changes made when
adding support for modules to the test framework.
parent 25c5ad8e
No related branches found
No related tags found
No related merge requests found
......@@ -23,8 +23,11 @@ __author__ = "Konstantin Osipov <kostja.osipov@gmail.com>"
import socket
import yaml
import re
from tarantool_connection import TarantoolConnection
is_admin_re = re.compile("^\s*(show|save|exec|exit|reload|help)", re.I)
class TarantoolAdmin(TarantoolConnection):
def execute_no_reconnect(self, command, noprint):
self.socket.sendall(command)
......
......@@ -32,8 +32,8 @@ import argparse
import socket
import sys
import string
from lib.tarantool_connection import AdminConnection, DataConnection, \
is_admin_re
from lib.tarantool_admin import TarantoolAdmin, is_admin_re
from lib.box import Box
class Options:
def __init__(self):
......@@ -94,8 +94,8 @@ def do_command(admin_con, data_con, line):
def main():
init_readline_history()
options = Options()
admin_con = AdminConnection(options.args.host, options.args.admin_port)
data_con = DataConnection(options.args.host, options.args.port)
admin_con = TarantoolAdmin(options.args.host, options.args.admin_port)
data_con = Box(options.args.host, options.args.port)
try:
admin_con.connect()
data_con.connect()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment