From 666fb74f78b8532ed4856cc968f28539215da38f Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Thu, 31 Mar 2011 15:40:11 +0400
Subject: [PATCH] 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.
---
test/lib/tarantool_admin.py | 3 +++
test/tarantool | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/test/lib/tarantool_admin.py b/test/lib/tarantool_admin.py
index d144c6af55..4788002c29 100644
--- a/test/lib/tarantool_admin.py
+++ b/test/lib/tarantool_admin.py
@@ -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)
diff --git a/test/tarantool b/test/tarantool
index 0f6c4784f2..db8b4c17d6 100755
--- a/test/tarantool
+++ b/test/tarantool
@@ -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()
--
GitLab