From 06c4b3e06d9247194f800df207ee52abe0b6ccaf Mon Sep 17 00:00:00 2001 From: Chinmay Soman Date: Mon, 1 Apr 2013 12:49:54 -0700 Subject: [PATCH] Moved slow store to single-slow-store.xml. Previously it was breaking the existing tests --- .../voldemort/config/single-slow-store.xml | 19 +++++++++++++++++++ test/common/voldemort/config/single-store.xml | 16 ---------------- .../coordinator/CoordinatorRestAPITest.java | 16 ++++++++++++++++ .../DynamicTimeoutStoreClientTest.java | 18 +++++++++++++++++- 4 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 test/common/voldemort/config/single-slow-store.xml diff --git a/test/common/voldemort/config/single-slow-store.xml b/test/common/voldemort/config/single-slow-store.xml new file mode 100644 index 0000000000..48a344cba4 --- /dev/null +++ b/test/common/voldemort/config/single-slow-store.xml @@ -0,0 +1,19 @@ + + + + slow-store-test + slow + Test slow store + consistent-routing + client + 1 + 1 + 1 + + string + + + string + + + diff --git a/test/common/voldemort/config/single-store.xml b/test/common/voldemort/config/single-store.xml index 07ec63da39..a0be7311f6 100644 --- a/test/common/voldemort/config/single-store.xml +++ b/test/common/voldemort/config/single-store.xml @@ -18,20 +18,4 @@ UTF-8 - - slow-store-test - slow - Test slow store - consistent-routing - client - 1 - 1 - 1 - - string - - - string - - diff --git a/test/unit/voldemort/coordinator/CoordinatorRestAPITest.java b/test/unit/voldemort/coordinator/CoordinatorRestAPITest.java index 7b287f9be1..496e6379be 100644 --- a/test/unit/voldemort/coordinator/CoordinatorRestAPITest.java +++ b/test/unit/voldemort/coordinator/CoordinatorRestAPITest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.coordinator; import static org.junit.Assert.fail; diff --git a/test/unit/voldemort/coordinator/DynamicTimeoutStoreClientTest.java b/test/unit/voldemort/coordinator/DynamicTimeoutStoreClientTest.java index 62d67a9f40..863a1e67cc 100644 --- a/test/unit/voldemort/coordinator/DynamicTimeoutStoreClientTest.java +++ b/test/unit/voldemort/coordinator/DynamicTimeoutStoreClientTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2013 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.coordinator; import static org.junit.Assert.fail; @@ -33,7 +49,7 @@ public class DynamicTimeoutStoreClientTest { private Cluster cluster; public static String socketUrl = ""; private static final String STORE_NAME = "slow-store-test"; - private static final String STORES_XML = "test/common/voldemort/config/single-store.xml"; + private static final String STORES_XML = "test/common/voldemort/config/single-slow-store.xml"; private static final String SLOW_STORE_DELAY = "500"; private final SocketStoreFactory socketStoreFactory = new ClientRequestExecutorPool(2, 10000,