From c1597d89f45d82fb6b71d762ea94592ca2c922e9 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 30 Aug 2013 17:00:36 +0400
Subject: [PATCH] Move box/protocol.test to connector_c suite.
---
.gitignore | 3 +--
test/box/CMakeLists.txt | 4 ----
test/box/protocol.test.py | 14 --------------
test/connector_c/CMakeLists.txt | 1 +
test/{box => connector_c}/protocol.c | 0
test/{box => connector_c}/protocol.result | 13 +++++++++++--
test/connector_c/protocol.test.py | 17 +++++++++++++++++
7 files changed, 30 insertions(+), 22 deletions(-)
delete mode 100644 test/box/CMakeLists.txt
delete mode 100644 test/box/protocol.test.py
rename test/{box => connector_c}/protocol.c (100%)
rename test/{box => connector_c}/protocol.result (68%)
create mode 100644 test/connector_c/protocol.test.py
diff --git a/.gitignore b/.gitignore
index 1c883aab34..280b72504a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,8 +53,7 @@ src/box/lua/*.lua.c
src/box/tarantool_box
src/box/tarantool.cfg
tarantool-*.tar.gz
-test/box/protocol
-test/box/connector
+test/connector_c/protocol
test/connector_c/rpl
test/connector_c/snap
test/connector_c/tt
diff --git a/test/box/CMakeLists.txt b/test/box/CMakeLists.txt
deleted file mode 100644
index 559ff400c2..0000000000
--- a/test/box/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-include_directories("${PROJECT_SOURCE_DIR}/connector/c/include")
-
-tarantool_client("protocol" protocol.c)
diff --git a/test/box/protocol.test.py b/test/box/protocol.test.py
deleted file mode 100644
index 5c35db0ce5..0000000000
--- a/test/box/protocol.test.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# encoding: utf-8
-#
-import subprocess
-import sys
-import os
-
-p = subprocess.Popen([ os.path.join(builddir, "test/box/protocol") ],
- stdout=subprocess.PIPE)
-p.wait()
-for line in p.stdout.readlines():
- sys.stdout.write(line)
-
-sql("delete from t0 where k0 = 1")
-# vim: syntax=python
diff --git a/test/connector_c/CMakeLists.txt b/test/connector_c/CMakeLists.txt
index 07bf2ad9e3..e3446fba10 100644
--- a/test/connector_c/CMakeLists.txt
+++ b/test/connector_c/CMakeLists.txt
@@ -4,6 +4,7 @@ set_source_files_compile_flags("TESTS" ${all_sources})
include_directories("${PROJECT_SOURCE_DIR}/test/unit")
include_directories("${PROJECT_SOURCE_DIR}/connector/c/include")
+tarantool_client("protocol" protocol.c)
tarantool_client("tt" tt.c)
tarantool_client("tp" tp.c)
tarantool_client("update" update.c)
diff --git a/test/box/protocol.c b/test/connector_c/protocol.c
similarity index 100%
rename from test/box/protocol.c
rename to test/connector_c/protocol.c
diff --git a/test/box/protocol.result b/test/connector_c/protocol.result
similarity index 68%
rename from test/box/protocol.result
rename to test/connector_c/protocol.result
index 251dba8d1a..eb11e644b8 100644
--- a/test/box/protocol.result
+++ b/test/connector_c/protocol.result
@@ -1,3 +1,11 @@
+box.insert(box.schema.SPACE_ID, 0, 0, 'tweedledum')
+---
+- [0, 0, 'tweedledum']
+...
+box.insert(box.schema.INDEX_ID, 0, 0, 'primary', 'hash', 1, 1, 0, 'str')
+---
+- [0, 0, 'primary', 1752392040, 1, 1, 0, 'str']
+...
*** test_ping ***
return_code: 0
*** test_ping: done ***
@@ -13,5 +21,6 @@ return_code: ER_NO_SUCH_INDEX, No index #1 is defined in space 0
*** test_bug1009992 ***
return_code: ER_ILLEGAL_PARAMS, Illegal parameters, unsupported command code, check the error log
*** test_bug1009992: done ***
- delete from t0 where k0 = 1
-Delete OK, 1 row affected
+ box.space[0]:drop()
+---
+...
diff --git a/test/connector_c/protocol.test.py b/test/connector_c/protocol.test.py
new file mode 100644
index 0000000000..8942e65d13
--- /dev/null
+++ b/test/connector_c/protocol.test.py
@@ -0,0 +1,17 @@
+# encoding: utf-8
+#
+import subprocess
+import sys
+import os
+
+admin("box.insert(box.schema.SPACE_ID, 0, 0, 'tweedledum')")
+admin("box.insert(box.schema.INDEX_ID, 0, 0, 'primary', 'hash', 1, 1, 0, 'str')")
+p = subprocess.Popen([ os.path.join(builddir, "test/connector_c/protocol") ],
+ stdout=subprocess.PIPE)
+p.wait()
+for line in p.stdout.readlines():
+ sys.stdout.write(line)
+
+admin("box.space[0]:drop()")
+
+# vim: syntax=python
--
GitLab