Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2462A10A4C for ; Fri, 31 Jan 2014 15:43:00 +0000 (UTC) Received: (qmail 32328 invoked by uid 500); 31 Jan 2014 15:42:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32199 invoked by uid 500); 31 Jan 2014 15:42:53 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 32133 invoked by uid 99); 31 Jan 2014 15:42:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 15:42:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 92E6F917CA3; Fri, 31 Jan 2014 15:42:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 31 Jan 2014 15:42:53 -0000 Message-Id: In-Reply-To: <0420688daac94ceb8bef66b2de5d45d7@git.apache.org> References: <0420688daac94ceb8bef66b2de5d45d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/9] git commit: fix fat client tests fix fat client tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f6c5ce6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6c5ce6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f6c5ce6 Branch: refs/heads/cassandra-1.2 Commit: 5f6c5ce68f53e8943a171679f595e99ff06afa49 Parents: 52e1def Author: Brandon Williams Authored: Fri Jan 31 09:40:06 2014 -0600 Committer: Brandon Williams Committed: Fri Jan 31 09:40:06 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +- test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +- .../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java index 3ac9ecb..298f1c7 100644 --- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java @@ -35,7 +35,7 @@ public class DynamicEndpointSnitchTest public void testSnitch() throws InterruptedException, IOException, ConfigurationException { // do this because SS needs to be initialized before DES can work properly. - StorageService.instance.initClient(); + StorageService.instance.initClient(0); int sleeptime = 150; SimpleSnitch ss = new SimpleSnitch(); DynamicEndpointSnitch dsnitch = new DynamicEndpointSnitch(ss, String.valueOf(ss.hashCode())); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/InitClientTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/InitClientTest.java b/test/unit/org/apache/cassandra/service/InitClientTest.java index 23c4b1c..7d44cd8 100644 --- a/test/unit/org/apache/cassandra/service/InitClientTest.java +++ b/test/unit/org/apache/cassandra/service/InitClientTest.java @@ -30,6 +30,6 @@ public class InitClientTest // extends CleanupHelper @Test public void testInitClientStartup() throws IOException, ConfigurationException { - StorageService.instance.initClient(); + StorageService.instance.initClient(0); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java index b473c18..19efe3a 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java @@ -35,7 +35,7 @@ public class StorageServiceClientTest { SchemaLoader.mkdirs(); SchemaLoader.cleanup(); - StorageService.instance.initClient(); + StorageService.instance.initClient(0); // verify that no storage directories were created. for (String path : DatabaseDescriptor.getAllDataFileLocations())