From 03dcd83766d8dff4dba3f46eb980c995372cd5af Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Thu, 17 Feb 2011 23:37:36 +0300
Subject: [PATCH] Minor cleanups
Rename a test file to avoid shell escapes, align
a comment, modify ./test-run defaults to follow
the new build layout.
---
test/box/configuration.result | 3 ++-
test/box/configuration.test | 5 +++--
test/box/{tarantool_#708685.cfg => tarantool_bug708685.cfg} | 0
test/test-run.py | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
rename test/box/{tarantool_#708685.cfg => tarantool_bug708685.cfg} (100%)
diff --git a/test/box/configuration.result b/test/box/configuration.result
index 941801fc5b..e6ad53afa1 100644
--- a/test/box/configuration.result
+++ b/test/box/configuration.result
@@ -1,6 +1,7 @@
# Bug #708685:
-# Addition of required configuration file options broke backward compatibility
+# Addition of required configuration file options broke backward
+# compatibility
# (https://bugs.launchpad.net/bugs/708685)
show stat
diff --git a/test/box/configuration.test b/test/box/configuration.test
index 387d1ccacd..036ac5f7c8 100644
--- a/test/box/configuration.test
+++ b/test/box/configuration.test
@@ -5,7 +5,8 @@ cfg = os.path.join(vardir, "tarantool.cfg")
print """
# Bug #708685:
-# Addition of required configuration file options broke backward compatibility
+# Addition of required configuration file options broke backward
+# compatibility
# (https://bugs.launchpad.net/bugs/708685)
"""
# stop current server
@@ -13,7 +14,7 @@ server.stop(True)
server.install(True)
# start server from config with holes in namespaces
os.unlink("var/tarantool.cfg")
-os.symlink(abspath("box/tarantool_#708685.cfg"), cfg)
+os.symlink(abspath("box/tarantool_bug708685.cfg"), cfg)
server.start(True)
# check connection
exec admin "show stat"
diff --git a/test/box/tarantool_#708685.cfg b/test/box/tarantool_bug708685.cfg
similarity index 100%
rename from test/box/tarantool_#708685.cfg
rename to test/box/tarantool_bug708685.cfg
diff --git a/test/test-run.py b/test/test-run.py
index 369a030dad..69ecdfaa23 100755
--- a/test/test-run.py
+++ b/test/test-run.py
@@ -106,8 +106,8 @@ class Options:
parser.add_argument(
"--bindir",
dest = "bindir",
- default = "../core",
- help = """Path to server binary. Default: " + "../core.""")
+ default = "../mod/silverbox",
+ help = """Path to server binary. Default: " + "../mod/silverbox.""")
parser.add_argument(
"--vardir",
--
GitLab