From d259a427602a5483ae47e930a18c39ba4c9abfde Mon Sep 17 00:00:00 2001
From: Aleksey Demakov <ademakov@gmail.com>
Date: Thu, 15 Dec 2011 22:08:25 +0400
Subject: [PATCH] consolidate space array gap tests
---
test/box/configuration.result | 63 ++++++++++++++---
test/box/configuration.test | 2 +-
test/box_big/configuration.result | 112 ------------------------------
test/box_big/configuration.test | 2 -
4 files changed, 56 insertions(+), 123 deletions(-)
delete mode 100644 test/box_big/configuration.result
delete mode 100644 test/box_big/configuration.test
diff --git a/test/box/configuration.result b/test/box/configuration.result
index 58aec17610..34b9c24797 100644
--- a/test/box/configuration.result
+++ b/test/box/configuration.result
@@ -4,15 +4,62 @@
# compatibility
# (https://bugs.launchpad.net/bugs/708685)
-show stat
+show configuration
---
-statistics:
- REPLACE: { rps: 0 , total: 0 }
- SELECT: { rps: 0 , total: 0 }
- UPDATE: { rps: 0 , total: 0 }
- DELETE_1_3: { rps: 0 , total: 0 }
- DELETE: { rps: 0 , total: 0 }
- CALL: { rps: 0 , total: 0 }
+configuration:
+ username: (null)
+ bind_ipaddr: "INADDR_ANY"
+ coredump: "false"
+ admin_port: "33015"
+ replication_port: "0"
+ log_level: "4"
+ slab_alloc_arena: "0.1"
+ slab_alloc_minimal: "64"
+ slab_alloc_factor: "2"
+ work_dir: (null)
+ pid_file: "box.pid"
+ logger: "cat - >> tarantool.log"
+ logger_nonblock: "true"
+ io_collect_interval: "0"
+ backlog: "1024"
+ readahead: "16320"
+ snap_dir: "."
+ wal_dir: "."
+ primary_port: "33013"
+ secondary_port: "33014"
+ too_long_threshold: "0.5"
+ custom_proc_title: (null)
+ memcached_port: "0"
+ memcached_space: "23"
+ memcached_expire: "false"
+ memcached_expire_per_loop: "1024"
+ memcached_expire_full_sweep: "3600"
+ snap_io_rate_limit: "0"
+ rows_per_wal: "50"
+ wal_fsync_delay: "0"
+ wal_writer_inbox_size: "128"
+ local_hot_standby: "false"
+ wal_dir_rescan_delay: "0.1"
+ panic_on_snap_error: "true"
+ panic_on_wal_error: "false"
+ replication_source: (null)
+ space[0].enabled: "true"
+ space[0].cardinality: "-1"
+ space[0].estimated_rows: "0"
+ space[0].index[0].type: "HASH"
+ space[0].index[0].unique: "true"
+ space[0].index[0].key_field[0].fieldno: "0"
+ space[0].index[0].key_field[0].type: "NUM"
+ space[1].enabled: "false"
+ space[1].cardinality: "-1"
+ space[1].estimated_rows: "0"
+ space[2].enabled: "true"
+ space[2].cardinality: "-1"
+ space[2].estimated_rows: "0"
+ space[2].index[0].type: "HASH"
+ space[2].index[0].unique: "true"
+ space[2].index[0].key_field[0].fieldno: "0"
+ space[2].index[0].key_field[0].type: "NUM"
...
# Bug #884768:
diff --git a/test/box/configuration.test b/test/box/configuration.test
index ae6ee0a5d1..6ecc5a0354 100644
--- a/test/box/configuration.test
+++ b/test/box/configuration.test
@@ -11,7 +11,7 @@ server.stop()
# start server from config with holes in spaces
server.deploy("box/tarantool_bug708685.cfg")
# check connection
-exec admin "show stat"
+exec admin "show configuration"
print """
# Bug #884768:
diff --git a/test/box_big/configuration.result b/test/box_big/configuration.result
deleted file mode 100644
index 404c651472..0000000000
--- a/test/box_big/configuration.result
+++ /dev/null
@@ -1,112 +0,0 @@
-show configuration
----
-configuration:
- username: (null)
- bind_ipaddr: "INADDR_ANY"
- coredump: "false"
- admin_port: "33015"
- replication_port: "0"
- log_level: "4"
- slab_alloc_arena: "0.1"
- slab_alloc_minimal: "64"
- slab_alloc_factor: "2"
- work_dir: (null)
- pid_file: "box.pid"
- logger: "cat - >> tarantool.log"
- logger_nonblock: "true"
- io_collect_interval: "0"
- backlog: "1024"
- readahead: "16320"
- snap_dir: "."
- wal_dir: "."
- primary_port: "33013"
- secondary_port: "33014"
- too_long_threshold: "0.5"
- custom_proc_title: (null)
- memcached_port: "0"
- memcached_space: "23"
- memcached_expire: "false"
- memcached_expire_per_loop: "1024"
- memcached_expire_full_sweep: "3600"
- snap_io_rate_limit: "0"
- rows_per_wal: "50"
- wal_fsync_delay: "0"
- wal_writer_inbox_size: "128"
- local_hot_standby: "false"
- wal_dir_rescan_delay: "0.1"
- panic_on_snap_error: "true"
- panic_on_wal_error: "false"
- replication_source: (null)
- space[0].enabled: "true"
- space[0].cardinality: "-1"
- space[0].estimated_rows: "0"
- space[0].index[0].type: "HASH"
- space[0].index[0].unique: "true"
- space[0].index[0].key_field[0].fieldno: "0"
- space[0].index[0].key_field[0].type: "STR"
- space[0].index[1].type: "TREE"
- space[0].index[1].unique: "false"
- space[0].index[1].key_field[0].fieldno: "1"
- space[0].index[1].key_field[0].type: "STR"
- space[1].enabled: "true"
- space[1].cardinality: "-1"
- space[1].estimated_rows: "0"
- space[1].index[0].type: "HASH"
- space[1].index[0].unique: "true"
- space[1].index[0].key_field[0].fieldno: "0"
- space[1].index[0].key_field[0].type: "STR"
- space[1].index[1].type: "TREE"
- space[1].index[1].unique: "true"
- space[1].index[1].key_field[0].fieldno: "1"
- space[1].index[1].key_field[0].type: "STR"
- space[1].index[1].key_field[1].fieldno: "2"
- space[1].index[1].key_field[1].type: "STR"
- space[2].enabled: "true"
- space[2].cardinality: "-1"
- space[2].estimated_rows: "0"
- space[2].index[0].type: "TREE"
- space[2].index[0].unique: "true"
- space[2].index[0].key_field[0].fieldno: "0"
- space[2].index[0].key_field[0].type: "NUM"
- space[3].enabled: "true"
- space[3].cardinality: "-1"
- space[3].estimated_rows: "0"
- space[3].index[0].type: "TREE"
- space[3].index[0].unique: "true"
- space[3].index[0].key_field[0].fieldno: "0"
- space[3].index[0].key_field[0].type: "STR"
- space[4].enabled: "true"
- space[4].cardinality: "-1"
- space[4].estimated_rows: "0"
- space[4].index[0].type: "HASH"
- space[4].index[0].unique: "true"
- space[4].index[0].key_field[0].fieldno: "0"
- space[4].index[0].key_field[0].type: "STR"
- space[4].index[1].type: "TREE"
- space[4].index[1].unique: "false"
- space[4].index[1].key_field[0].fieldno: "1"
- space[4].index[1].key_field[0].type: "STR"
- space[5].enabled: "true"
- space[5].cardinality: "-1"
- space[5].estimated_rows: "0"
- space[5].index[0].type: "TREE"
- space[5].index[0].unique: "true"
- space[5].index[0].key_field[0].fieldno: "0"
- space[5].index[0].key_field[0].type: "NUM64"
- space[5].index[1].type: "TREE"
- space[5].index[1].unique: "false"
- space[5].index[1].key_field[0].fieldno: "1"
- space[5].index[1].key_field[0].type: "STR"
- space[5].index[1].key_field[1].fieldno: "2"
- space[5].index[1].key_field[1].type: "STR"
- space[6].enabled: "false"
- space[6].cardinality: "-1"
- space[6].estimated_rows: "0"
- space[7].enabled: "false"
- space[7].cardinality: "-1"
- space[7].estimated_rows: "0"
- space[7].index[0].type: "TREE"
- space[7].index[0].unique: "true"
- space[7].index[0].key_field[0].fieldno: "1"
- space[7].index[0].key_field[0].type: "NUM"
-...
diff --git a/test/box_big/configuration.test b/test/box_big/configuration.test
deleted file mode 100644
index dbffb06c04..0000000000
--- a/test/box_big/configuration.test
+++ /dev/null
@@ -1,2 +0,0 @@
-# encoding: tarantool
-exec admin "show configuration"
--
GitLab