This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch test-runner has been updated
via 66e5ed9489a7a976e998007438f4503d443b87f6 (commit)
from df298cada5a2adb4892b2e8db01f06dbcf636a18 (commit)
Summary of changes:
test/lib/tarantool_silverbox_server.py | 8 ++++----
test/test-run.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
mode change 100755 => 100644 test/lib/admin.py
commit 66e5ed9489a7a976e998007438f4503d443b87f6
Author: Konstantin Osipov <[email protected]>
Date: Fri Dec 17 18:51:50 2010 +0300
Test-runner: improve error messages.
Provide better diagnostics when we can't even enter
the directory where we expect to find the server binary.
diff --git a/test/lib/admin.py b/test/lib/admin.py
old mode 100755
new mode 100644
diff --git a/test/lib/tarantool_silverbox_server.py
b/test/lib/tarantool_silverbox_server.py
index d959479..03394cb 100644
--- a/test/lib/tarantool_silverbox_server.py
+++ b/test/lib/tarantool_silverbox_server.py
@@ -104,18 +104,18 @@ class TarantoolSilverboxServer:
"""Locate server executable in the bindir. We just take
the first thing looking like an exe in there."""
+ print " Looking for server binary in {0}...".format(self.args.bindir)
if (os.access(self.args.bindir, os.F_OK) == False or
stat.S_ISDIR(os.stat(self.args.bindir).st_mode) == False):
- raise TestRunException("Directory " + self.args.bindir +
- " doesn't exist")
+ raise RuntimeError("Directory " + self.args.bindir + " doesn't exist")
for f in os.listdir(self.args.bindir):
f = os.path.join(self.args.bindir, f)
st_mode = os.stat(f).st_mode
if stat.S_ISREG(st_mode) and st_mode & stat.S_IXUSR:
return f
- raise TestRunException("Can't find server executable in " +
- self.args.bindir)
+ raise RuntimeError("Can't find server executable in " +
+ self.args.bindir)
def kill_old_server(self):
"""Kill old server instance if it exists."""
diff --git a/test/test-run.py b/test/test-run.py
index cae7db1..104151f 100755
--- a/test/test-run.py
+++ b/test/test-run.py
@@ -132,7 +132,7 @@ def main():
for suite in suites:
suite.run_all()
except RuntimeError as e:
- print "\nFatal error: ", e, ". Execution aborted."
+ print "\nFatal error: {0}. Execution aborted.".format(e)
return (-1)
return 0
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
