From 9d696958afb2140c880f9cdb0f00d4c0008c2255 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 5 Sep 2014 19:52:05 +0400
Subject: [PATCH] Reduce the amount of memory allocated by app tests.
---
test/app/boolean.test.lua | 1 +
test/app/cfg.test.lua | 5 ++++-
test/app/console.test.lua | 3 ++-
test/app/init_script.result | 2 +-
test/app/init_script.test.lua | 1 +
test/app/logger.test.lua | 5 ++++-
test/app/pcall.test.lua | 5 ++++-
7 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/test/app/boolean.test.lua b/test/app/boolean.test.lua
index 4e1bfe3873..04a8f3811c 100755
--- a/test/app/boolean.test.lua
+++ b/test/app/boolean.test.lua
@@ -5,6 +5,7 @@
--
box.cfg{logger_nonblock=true,
panic_on_wal_error=true,
+ slab_alloc_arena=0.1,
logger="tarantool.log"
}
print(box.cfg.logger_nonblock)
diff --git a/test/app/cfg.test.lua b/test/app/cfg.test.lua
index 6f99c7ec07..bce98a2db2 100755
--- a/test/app/cfg.test.lua
+++ b/test/app/cfg.test.lua
@@ -10,7 +10,10 @@ local function test()
end
print(pcall(test))
-box.cfg{logger="tarantool.log"}
+box.cfg{
+ logger="tarantool.log",
+ slab_alloc_arena=0.1,
+}
print(pcall(test))
os.exit(0)
diff --git a/test/app/console.test.lua b/test/app/console.test.lua
index fa88212e75..516d4eb46d 100755
--- a/test/app/console.test.lua
+++ b/test/app/console.test.lua
@@ -13,7 +13,8 @@ os.remove(IPROTO_SOCKET)
box.cfg{
listen='unix://'..IPROTO_SOCKET;
- logger="tarantool.log"
+ slab_alloc_arena=0.1,
+ logger="tarantool.log",
}
--
diff --git a/test/app/init_script.result b/test/app/init_script.result
index 9d7935bccc..428c555e57 100644
--- a/test/app/init_script.result
+++ b/test/app/init_script.result
@@ -9,7 +9,7 @@ box.cfg
4 slab_alloc_minimal:64
5 background:false
6 logger:tarantool.log
-7 slab_alloc_arena:1
+7 slab_alloc_arena:0.1
8 log_level:5
9 listen:3314
10 logger_nonblock:true
diff --git a/test/app/init_script.test.lua b/test/app/init_script.test.lua
index 2bb0552cfe..6a9e328c32 100755
--- a/test/app/init_script.test.lua
+++ b/test/app/init_script.test.lua
@@ -5,6 +5,7 @@
box.cfg{
listen = 3314,
pid_file = "box.pid",
+ slab_alloc_arena=0.1,
logger="tarantool.log"
}
diff --git a/test/app/logger.test.lua b/test/app/logger.test.lua
index 0076bc4e83..66477ad562 100755
--- a/test/app/logger.test.lua
+++ b/test/app/logger.test.lua
@@ -5,7 +5,10 @@
--
local filename = "1.log"
local message = "Hello, World!"
-box.cfg{logger=filename}
+box.cfg{
+ logger=filename,
+ slab_alloc_arena=0.1,
+}
local log = require('log')
local io = require('io')
local file = io.open(filename)
diff --git a/test/app/pcall.test.lua b/test/app/pcall.test.lua
index 91557e3218..ef3b51f020 100755
--- a/test/app/pcall.test.lua
+++ b/test/app/pcall.test.lua
@@ -6,7 +6,10 @@ print[[
--------------------------------------------------------------------------------
]]
-box.cfg{logger="tarantool.log"}
+box.cfg{
+ logger="tarantool.log",
+ slab_alloc_arena=0.1,
+}
function pcalltest()
local ERRMSG = "module 'some_invalid_module' not found"
local status, msg = pcall(require, 'some_invalid_module')
--
GitLab