Updated Branches: refs/heads/cassandra-1.1 fe910e6c9 -> 971a95abf
Ninja-unify 1.1/1.2/2.0 system tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/971a95ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/971a95ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/971a95ab Branch: refs/heads/cassandra-1.1 Commit: 971a95abfc23dd0e265d439f4d2f024d2c552370 Parents: fe910e6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon May 6 00:59:10 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon May 6 00:59:10 2013 +0300 ---------------------------------------------------------------------- test/cassandra.in.sh | 2 +- test/system/__init__.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/971a95ab/test/cassandra.in.sh ---------------------------------------------------------------------- diff --git a/test/cassandra.in.sh b/test/cassandra.in.sh index 682327f..936f47d 100644 --- a/test/cassandra.in.sh +++ b/test/cassandra.in.sh @@ -39,7 +39,7 @@ JVM_OPTS=" \ -Xrunjdwp:transport=dt_socket,server=y,address=8898,suspend=n \ -Xms128M \ -Xmx1G \ - -Xss128k \ + -Xss180k \ -XX:SurvivorRatio=8 \ -XX:TargetSurvivorRatio=90 \ -XX:+AggressiveOpts \ http://git-wip-us.apache.org/repos/asf/cassandra/blob/971a95ab/test/system/__init__.py ---------------------------------------------------------------------- diff --git a/test/system/__init__.py b/test/system/__init__.py index d9b88ee..669bf6d 100644 --- a/test/system/__init__.py +++ b/test/system/__init__.py @@ -65,14 +65,14 @@ class BaseTester(object): if os.path.exists(pid_fname): pid_path = os.path.join(root, pid_fname) print "Unclean shutdown detected, (%s found)" % pid_path - sys.exit() + raise Exception('damn it') # clean out old stuff import shutil # todo get directories from conf/cassandra.yaml for dirname in ['system', 'data', 'commitlog']: try: - shutil.rmtree('build/test/cassandra/' + dirname) + shutil.rmtree(os.path.join(root, 'build', 'test', 'cassandra', dirname)) except OSError: pass # start the server @@ -103,7 +103,7 @@ class BaseTester(object): stdout_value, stderr_value = process.communicate() print "Stdout: %s" % (stdout_value) print "Stderr: %s" % (stderr_value) - sys.exit() + raise Exception('damn it') else: try: self.open_client() @@ -132,6 +132,8 @@ class BaseTester(object): if not is_alive(spid): break slept += 0.5 + # Give time for cassandra to shutdown + time.sleep(2) if (slept > max_wait and is_alive(spid)): os.kill(spid, signal.SIGKILL) fpath = os.path.join(root, pid_fname)