diff --git a/test/box/configuration.result b/test/box/configuration.result index 941801fc5be6925bec07eb062bd60db4e85809ec..e6ad53afa16729d7340cc332ccb590810e41c883 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 387d1ccacdce807bb9888bc32807c0100a289129..036ac5f7c8b3489a353bea808f00d4021bbf6deb 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 369a030dad6172285cd261b103e8da0a9a47f404..69ecdfaa23fe70821aa5ec63b9f2180d5ec6cfd2 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",