diff --git a/test/connector_c/cfg/master.cfg b/test/connector_c/cfg/master.cfg index a04a7d43f8abeea9e116d572c7774a3311beec5a..37a64dde1bf928acbfed08982448a7c5d7f2ba72 100644 --- a/test/connector_c/cfg/master.cfg +++ b/test/connector_c/cfg/master.cfg @@ -9,10 +9,3 @@ admin_port = 33015 replication_port = 33016 rows_per_wal = 50 - -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "STR" - diff --git a/test/connector_c/cfg/tarantool.cfg b/test/connector_c/cfg/tarantool.cfg index 3a8088fff9137434df68584a748d8f5585ff96f2..2d60071c5062bc01006e0f638ff81d6386352cec 100644 --- a/test/connector_c/cfg/tarantool.cfg +++ b/test/connector_c/cfg/tarantool.cfg @@ -8,9 +8,3 @@ secondary_port = 33014 admin_port = 33015 rows_per_wal = 50 - -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" diff --git a/test/connector_c/connector.result b/test/connector_c/connector.result index 4af85f976f75d8f882e0646145995778c1e05b82..193491abfef4b108f786bcba5810bb40a539f8a0 100644 --- a/test/connector_c/connector.result +++ b/test/connector_c/connector.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'] +... > tuple1 [OK] > tuple2 [OK] > list [OK] @@ -40,3 +48,6 @@ > sql select limit [OK] > sql delete [OK] > sql call [OK] +box.space[0]:drop() +--- +... diff --git a/test/connector_c/connector.test.py b/test/connector_c/connector.test.py index 7f829b1d930f770f592e462cdc8a6284b185b251..000b486a9ef1b9c123eda2c723a66c419678097e 100644 --- a/test/connector_c/connector.test.py +++ b/test/connector_c/connector.test.py @@ -2,6 +2,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/tt")], stdout=subprocess.PIPE) @@ -9,4 +11,6 @@ p.wait() for line in p.stdout.readlines(): sys.stdout.write(line) +admin("box.space[0]:drop()") + # vim: syntax=python diff --git a/test/connector_c/tp.result b/test/connector_c/tp.result index 53248fa9136fcc947ec77f1e2389668d972aa54e..a5d915b32aaa31ae0f11247f927fa6879062eda9 100644 --- a/test/connector_c/tp.result +++ b/test/connector_c/tp.result @@ -1,3 +1,14 @@ +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'] +... tuple fields: 2 tuple size: 42 [_i32, 0e72ae1a-d0be-4e49-aeb9-aebea074363c] +box.space[0]:drop() +--- +... diff --git a/test/connector_c/tp.test.py b/test/connector_c/tp.test.py index 41944c25e05ba9daa0de736da9844efc3b958503..a3161c5f34ae29e8098581cd5eac9b863d562974 100644 --- a/test/connector_c/tp.test.py +++ b/test/connector_c/tp.test.py @@ -2,7 +2,12 @@ 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/tp")], stdout=subprocess.PIPE) o,e = p.communicate() sys.stdout.write(o) + +admin("box.space[0]:drop()") diff --git a/test/connector_c/update.result b/test/connector_c/update.result index 4305af126055686f6fdd629d0b3faa1b958f75c6..e1d2b52a7983a84acfedb14a9881c9c97cbe021e 100644 --- a/test/connector_c/update.result +++ b/test/connector_c/update.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_simple_set *** # insert tuple insert: respond ok (op: 13, reqid: 0, code: 0, count: 1) @@ -278,4 +286,6 @@ update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1) # test: update w/ grater than maximal allowed opearions count update fields: respond ok (op: 19, reqid: 0, code: 514, count: 0) *** test_boundary_args: done *** - \ No newline at end of file + box.space[0]:drop() +--- +... diff --git a/test/connector_c/update.test.py b/test/connector_c/update.test.py index a516b6575b219cfbe8d72caf55807c3dd33067bc..991105195dd41128b8569596cdcd108eea5676e1 100644 --- a/test/connector_c/update.test.py +++ b/test/connector_c/update.test.py @@ -2,13 +2,19 @@ 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/update") ], stdout=subprocess.PIPE) p.wait() for line in p.stdout.readlines(): sys.stdout.write(line) # resore default suite -server.stop() -server.deploy(self.suite_ini["config"]) -server.start() +#server.stop() +#server.deploy(self.suite_ini["config"]) +#server.start() + +admin("box.space[0]:drop()") + # vim: syntax=python