Modified: whirr/trunk/core/src/test/java/org/apache/whirr/util/UtilsTest.java URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/test/java/org/apache/whirr/util/UtilsTest.java?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/core/src/test/java/org/apache/whirr/util/UtilsTest.java (original) +++ whirr/trunk/core/src/test/java/org/apache/whirr/util/UtilsTest.java Tue Mar 27 22:00:24 2012 @@ -18,19 +18,20 @@ package org.apache.whirr.util; -import org.apache.whirr.Cluster; -import org.apache.whirr.Cluster.Instance; -import org.apache.whirr.ClusterSpec; -import org.junit.Test; +import static junit.framework.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; -import java.util.HashSet; -import static junit.framework.Assert.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.apache.whirr.Cluster; +import org.apache.whirr.Cluster.Instance; +import org.apache.whirr.ClusterSpec; +import org.junit.Test; + +import com.google.common.collect.ImmutableSet; public class UtilsTest { @@ -45,11 +46,7 @@ public class UtilsTest { Cluster cluster = mock(Cluster.class); - when(cluster.getInstances()).thenReturn(new HashSet<Cluster.Instance>() { - { - add(instance); - } - }); + when(cluster.getInstances()).thenReturn(ImmutableSet.<Cluster.Instance>of(instance)); ClusterSpec spec = mock(ClusterSpec.class); when(spec.getClusterUser()).thenReturn("test-identity");
Modified: whirr/trunk/platforms/karaf/feature/pom.xml URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/feature/pom.xml?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/platforms/karaf/feature/pom.xml (original) +++ whirr/trunk/platforms/karaf/feature/pom.xml Tue Mar 27 22:00:24 2012 @@ -47,7 +47,7 @@ <dnsjava.version>2.0.8</dnsjava.version> <javax.mail.bundle.version>1.4.1_4</javax.mail.bundle.version> <junit.bundle.version>4.9_1</junit.bundle.version> - <jclouds.karaf.version>1.3.2_1</jclouds.karaf.version> + <jclouds.karaf.version>1.4.0</jclouds.karaf.version> <jopt.simple.bundle.version>4.3_1</jopt.simple.bundle.version> <jsch.bundle.version>0.1.44_2</jsch.bundle.version> <not-yet-commons-ssl.bundle.version>0.3.11_1 Modified: whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java (original) +++ whirr/trunk/platforms/karaf/itests/src/test/java/org/apache/whirr/karaf/itest/WhirrKarafTestSupport.java Tue Mar 27 22:00:24 2012 @@ -55,7 +55,7 @@ import static org.ops4j.pax.exam.CoreOpt public class WhirrKarafTestSupport { public static final Long COMMAND_TIMEOUT = 300000L; - public static final Long SERVICE_TIMEOUT = 30000L; + public static final Long SERVICE_TIMEOUT = 150000L; public final String GROUP_ID = "org.apache.karaf"; public final String ARTIFACT_ID = "apache-karaf"; Modified: whirr/trunk/platforms/karaf/itests/src/test/resources/whirr-zookeeper-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/platforms/karaf/itests/src/test/resources/whirr-zookeeper-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/platforms/karaf/itests/src/test/resources/whirr-zookeeper-test.properties (original) +++ whirr/trunk/platforms/karaf/itests/src/test/resources/whirr-zookeeper-test.properties Tue Mar 27 22:00:24 2012 @@ -22,6 +22,5 @@ whirr.provider=${sys:whirr.test.provider whirr.identity=${sys:whirr.test.identity} whirr.credential=${sys:whirr.test.credential} -whirr.hardware-min-ram=512 whirr.zookeeper.tarball.url=http://archive.apache.org/dist/zookeeper/zookeeper-3.3.3/zookeeper-3.3.3.tar.gz jclouds.compute.timeout.node-running=240000 Modified: whirr/trunk/pom.xml URL: http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/pom.xml (original) +++ whirr/trunk/pom.xml Tue Mar 27 22:00:24 2012 @@ -71,7 +71,7 @@ <hama.version>0.4.0-incubating</hama.version> <hbase.version>0.89.20100924-28</hbase.version> <jackson.version>1.5.2</jackson.version> - <jclouds.version>1.3.2</jclouds.version> + <jclouds.version>1.4.0</jclouds.version> <jdom.version>1.1</jdom.version> <jopt.simple.version>3.2</jopt.simple.version> <jsch.version>0.1.44-1</jsch.version> Added: whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/CassandraServiceDryRunTest.java URL: http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/CassandraServiceDryRunTest.java?rev=1306027&view=auto ============================================================================== --- whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/CassandraServiceDryRunTest.java (added) +++ whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/CassandraServiceDryRunTest.java Tue Mar 27 22:00:24 2012 @@ -0,0 +1,44 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.whirr.service.cassandra; + +import static com.google.common.base.Predicates.containsPattern; + +import org.apache.whirr.service.BaseServiceDryRunTest; + +import com.google.common.base.Predicate; + +public class CassandraServiceDryRunTest extends BaseServiceDryRunTest { + + @Override + protected String getRole() { + return "cassandra"; + } + + @Override + protected Predicate<CharSequence> bootstrapPredicate() { + return containsPattern("install_service cassandra"); + } + + @Override + protected Predicate<CharSequence> configurePredicate() { + return containsPattern("seeds"); + } + +} Modified: whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties (original) +++ whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties Tue Mar 27 22:00:24 2012 @@ -22,5 +22,3 @@ whirr.provider=${sys:whirr.test.provider whirr.identity=${sys:whirr.test.identity} whirr.credential=${sys:whirr.test.credential} -whirr.hardware-min-ram=512 - Modified: whirr/trunk/services/cdh-oldtests/src/test/resources/whirr-zookeeper-cdh3-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/services/cdh-oldtests/src/test/resources/whirr-zookeeper-cdh3-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/cdh-oldtests/src/test/resources/whirr-zookeeper-cdh3-test.properties (original) +++ whirr/trunk/services/cdh-oldtests/src/test/resources/whirr-zookeeper-cdh3-test.properties Tue Mar 27 22:00:24 2012 @@ -27,6 +27,3 @@ whirr.env.repo=cdh3u2 whirr.zookeeper.install-function=install_cdh_zookeeper whirr.zookeeper.configure-function=configure_cdh_zookeeper -# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746 -# whirr.hardware-min-ram=512 - Modified: whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties (original) +++ whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties Tue Mar 27 22:00:24 2012 @@ -27,9 +27,6 @@ whirr.env.repo=cdh4 whirr.zookeeper.install-function=install_cdh_zookeeper whirr.zookeeper.configure-function=configure_cdh_zookeeper -# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746 -# whirr.hardware-min-ram=512 - # CDH4b1 only has RPMs available (not debs) so use Centos whirr.hardware-id=m1.large # RightImage CentOS_5.4_x64_v4.4.10 Modified: whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/ChefServiceDryRunTest.java URL: http://svn.apache.org/viewvc/whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/ChefServiceDryRunTest.java?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/ChefServiceDryRunTest.java (original) +++ whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/ChefServiceDryRunTest.java Tue Mar 27 22:00:24 2012 @@ -7,7 +7,7 @@ * "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 + * 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, @@ -18,80 +18,35 @@ package org.apache.whirr.service.chef; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +import static com.google.common.base.Predicates.and; +import static com.google.common.base.Predicates.contains; +import static com.google.common.base.Predicates.containsPattern; +import static java.util.regex.Pattern.LITERAL; +import static java.util.regex.Pattern.compile; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.Map.Entry; - -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.whirr.ClusterController; import org.apache.whirr.ClusterSpec; -import org.apache.whirr.service.DryRunModule; +import org.apache.whirr.service.BaseServiceDryRunTest; import org.apache.whirr.service.DryRunModule.DryRun; -import org.jclouds.compute.callables.RunScriptOnNode; -import org.jclouds.compute.callables.RunScriptOnNodeAsInitScriptUsingSsh; -import org.jclouds.compute.callables.RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete; -import org.jclouds.compute.callables.SudoAwareInitManager; -import org.jclouds.compute.domain.NodeMetadata; -import org.jclouds.scriptbuilder.InitBuilder; -import org.jclouds.scriptbuilder.domain.OsFamily; -import org.junit.Before; import org.junit.Test; import com.google.common.base.Predicate; -import com.google.common.collect.ListMultimap; -import com.jcraft.jsch.JSchException; +import com.google.common.collect.ImmutableMap; -public class ChefServiceDryRunTest { +public class ChefServiceDryRunTest extends BaseServiceDryRunTest { - private Configuration chefOnly; - private Configuration cookbookWithDefaultRecipe; - private Configuration cookbookWithSpecificRecipe; - private Configuration cookbookWithAttributes; - - @Before - public void setUp() { - - DryRunModule.resetDryRun(); - - chefOnly = newConfig(); - chefOnly.setProperty("whirr.instance-templates", "1 chef"); - - cookbookWithDefaultRecipe = newConfig(); - cookbookWithDefaultRecipe.setProperty("whirr.instance-templates", - "1 chef:java"); - - cookbookWithSpecificRecipe = newConfig(); - cookbookWithSpecificRecipe.setProperty("whirr.instance-templates", - "1 chef:java:sun"); - - cookbookWithAttributes = newConfig(); - cookbookWithAttributes.setProperty("whirr.instance-templates", - "1 chef:java"); - cookbookWithAttributes.addProperty("java.url", "http://testurl";); - cookbookWithAttributes.addProperty("java.version", "1.5"); - cookbookWithAttributes.addProperty("java.flavor", "vanilla"); - } - - private Configuration newConfig() { - Configuration config = new PropertiesConfiguration(); - config.setProperty("whirr.provider", "stub"); - config.setProperty("whirr.cluster-name", "stub-test"); - config.setProperty("whirr.state-store", "memory"); - return config; - } - - private ClusterController launchWithConfig(Configuration config) - throws IOException, InterruptedException, ConfigurationException, - JSchException { - ClusterSpec clusterSpec = ClusterSpec.withTemporaryKeys(config); - ClusterController controller = new ClusterController(); - controller.launchCluster(clusterSpec); - return controller; + @Override + protected String getRole() { + return "chef:java"; + } + + @Override + protected Predicate<CharSequence> bootstrapPredicate() { + return and(containsPattern("install_ruby"), containsPattern("install_chef")); + } + + @Override + protected Predicate<CharSequence> configurePredicate() { + return contains(compile("{\"run_list\":[\"recipe[java]\"]}", LITERAL)); } /** @@ -100,9 +55,10 @@ public class ChefServiceDryRunTest { */ @Test public void testChefOnly() throws Exception { - launchWithConfig(chefOnly); - assertInstallFunctionsWereExecuted(DryRun.INSTANCE); - assertNoEntryForPhase(DryRun.INSTANCE, "configure"); + ClusterSpec chefOnly = newClusterSpecForProperties(ImmutableMap.of("whirr.instance-templates", "1 chef")); + DryRun dryRun = launchWithClusterSpec(chefOnly); + assertScriptPredicateOnPhase(dryRun, "bootstrap", bootstrapPredicate()); + assertNoEntryForPhase(dryRun, "configure"); } /** @@ -111,17 +67,16 @@ public class ChefServiceDryRunTest { */ @Test public void testChefWithDefaultRecipe() throws Exception { - launchWithConfig(cookbookWithDefaultRecipe); - assertInstallFunctionsWereExecuted(DryRun.INSTANCE); + ClusterSpec cookbookWithDefaultRecipe = newClusterSpecForProperties(ImmutableMap.of("whirr.instance-templates", + "1 chef:java")); + DryRun dryRun = launchWithClusterSpec(cookbookWithDefaultRecipe); + + assertScriptPredicateOnPhase(dryRun, "bootstrap", bootstrapPredicate()); + // chef execution with a default cookbook recipe should contain a // particular string - assertScriptPredicateOnPhase(DryRun.INSTANCE, "configure", - new Predicate<String>() { - @Override - public boolean apply(String input) { - return input.contains("chef-solo -j /tmp/java::default"); - } - }); + assertScriptPredicateOnPhase(dryRun, "configure", + containsPattern("chef-solo -j /tmp/java::default")); } /** @@ -130,17 +85,16 @@ public class ChefServiceDryRunTest { */ @Test public void testChefWithAttributes() throws Exception { - launchWithConfig(cookbookWithSpecificRecipe); - assertInstallFunctionsWereExecuted(DryRun.INSTANCE); + ClusterSpec cookbookWithSpecificRecipe = newClusterSpecForProperties(ImmutableMap.of("whirr.instance-templates", + "1 chef:java:sun")); + DryRun dryRun = launchWithClusterSpec(cookbookWithSpecificRecipe); + + assertScriptPredicateOnPhase(dryRun, "bootstrap", bootstrapPredicate()); + // chef execution with a default cookbook recipe should contain a // particular string - assertScriptPredicateOnPhase(DryRun.INSTANCE, "configure", - new Predicate<String>() { - @Override - public boolean apply(String input) { - return input.contains("chef-solo -j /tmp/java::sun"); - } - }); + assertScriptPredicateOnPhase(dryRun, "configure", + containsPattern("chef-solo -j /tmp/java::sun")); } /** @@ -149,82 +103,17 @@ public class ChefServiceDryRunTest { */ @Test public void testChefWithParticularRecipe() throws Exception { - launchWithConfig(cookbookWithAttributes); - assertInstallFunctionsWereExecuted(DryRun.INSTANCE); + ClusterSpec cookbookWithAttributes = newClusterSpecForProperties(ImmutableMap.<String, String> builder() + .put("whirr.instance-templates", "1 chef:java").put("java.url", "http://testurl";) + .put("java.version", "1.5").put("java.flavor", "vanilla").build()); + DryRun dryRun = launchWithClusterSpec(cookbookWithAttributes); + + assertScriptPredicateOnPhase(dryRun, "bootstrap", bootstrapPredicate()); + // chef execution with a default cookbook recipe should contain a // particular string - assertScriptPredicateOnPhase(DryRun.INSTANCE, "configure", - new Predicate<String>() { - @Override - public boolean apply(String input) { - return input - .contains("{\"java\":{\"version\":\"1.5\",\"flavor\":\"vanilla\"}"); - } - }); - } - - private void assertScriptPredicateOnPhase(DryRun dryRun, String phase, - Predicate<String> predicate) throws Exception { - assertScriptPredicate(getEntryForPhase(dryRun.getExecutions(), phase), - predicate); - } - - private void assertScriptPredicate( - Entry<NodeMetadata, RunScriptOnNode> entry, Predicate<String> predicate) { - assertTrue("The predicate did not match", - predicate.apply(entry.getValue().getStatement().render(OsFamily.UNIX))); - } - - private void assertInstallFunctionsWereExecuted(DryRun dryRun) - throws Exception { - - Entry<NodeMetadata, RunScriptOnNode> setup = getEntryForPhase( - dryRun.getExecutions(), "setup-"); - - assertScriptPredicate(setup, new Predicate<String>() { - @Override - public boolean apply(String input) { - return input.contains("install_ruby"); - } - }); - - assertScriptPredicate(setup, new Predicate<String>() { - @Override - public boolean apply(String input) { - return input.contains("install_chef"); - } - }); - } - - private void assertNoEntryForPhase(DryRun dryRun, String phaseName) throws Exception { - try { - fail("Found entry: " + getEntryForPhase(dryRun.getExecutions(), phaseName)); - - } catch (IllegalStateException e) { - // No entry found - OK - } - } - - private Entry<NodeMetadata, RunScriptOnNode> getEntryForPhase( - ListMultimap<NodeMetadata, RunScriptOnNode> executions, String phaseName) - throws Exception { - for (Entry<NodeMetadata, RunScriptOnNode> entry : executions.entries()) { - if (getScriptName(entry.getValue()).startsWith(phaseName)) { - return entry; - } - } - throw new IllegalStateException("phase not found: " + phaseName); - } - - private String getScriptName(RunScriptOnNode script) throws Exception { - if (script instanceof RunScriptOnNodeAsInitScriptUsingSsh) { - Field initField = SudoAwareInitManager.class - .getDeclaredField("init"); - initField.setAccessible(true); - return ((InitBuilder) initField - .get((RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete) script)) - .getInstanceName(); - } - throw new IllegalArgumentException(); + assertScriptPredicateOnPhase(dryRun, "configure", + contains(compile("{\"java\":{\"version\":\"1.5\",\"flavor\":\"vanilla\"}", LITERAL))); } + } Modified: whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/RecipeTest.java URL: http://svn.apache.org/viewvc/whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/RecipeTest.java?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/RecipeTest.java (original) +++ whirr/trunk/services/chef/src/test/java/org/apache/whirr/service/chef/RecipeTest.java Tue Mar 27 22:00:24 2012 @@ -28,9 +28,9 @@ public class RecipeTest { private static final String NGINX_JSON = "{\"run_list\":[\"recipe[nginx]\"]}"; private static final String POSTGRES_JSON = "{\"run_list\":[\"recipe[postgresql::server]\"]}"; private static final String RESOLVER_JSON = "{\"resolver\":{\"nameservers\":[\"10.0.0.1\"],\"search\":\"int.example.com\"},\"run_list\":[\"recipe[resolver]\"]}"; - private static final String CHEF_COMMAND = "cat > /tmp/test.json <<'END_OF_FILE'\n" - + "{\"nginx\":{\"webport\":\"90\"},\"run_list\":[\"recipe[nginx]\"]}\n" - + "END_OF_FILE\n" + "sudo -i chef-solo -j /tmp/test.json -r http://myurl\n";; + private static final String CHEF_COMMAND = "cat > /tmp/test.json <<-'END_OF_JCLOUDS_FILE'\n" + + "\t{\"nginx\":{\"webport\":\"90\"},\"run_list\":[\"recipe[nginx]\"]}\n" + + "END_OF_JCLOUDS_FILE\n" + "sudo -i chef-solo -j /tmp/test.json -r http://myurl\n";; @Test public void testJSONConversion() { Modified: whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties (original) +++ whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties Tue Mar 27 22:00:24 2012 @@ -21,6 +21,3 @@ whirr.instance-templates=2 elasticsearch whirr.provider=${sys:whirr.test.provider} whirr.identity=${sys:whirr.test.identity} whirr.credential=${sys:whirr.test.credential} - -whirr.hardware-min-ram=512 - Modified: whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties (original) +++ whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties Tue Mar 27 22:00:24 2012 @@ -22,5 +22,3 @@ whirr.provider=${sys:whirr.test.provider whirr.identity=${sys:whirr.test.identity} whirr.credential=${sys:whirr.test.credential} -whirr.hardware-min-ram=512 - Modified: whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java URL: http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java (original) +++ whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java Tue Mar 27 22:00:24 2012 @@ -94,7 +94,7 @@ public class HadoopConfigurationBuilderT List<Processor> processors = ImmutableList.of(new Processor(4, 1.0)); Hardware hardware = new HardwareImpl(null, null, "id", null, null, ImmutableMap.<String,String>of(), ImmutableSet.<String>of(), processors, - 1024, ImmutableList.<Volume>of(), null); + 1024, ImmutableList.<Volume>of(), null, "xen"); when(node.getHardware()).thenReturn(hardware); Builder<Instance> instances = ImmutableSet.<Instance>builder(); Modified: whirr/trunk/services/puppet/src/test/java/org/apache/whirr/service/puppet/PuppetClusterActionHandlerFactoryTest.java URL: http://svn.apache.org/viewvc/whirr/trunk/services/puppet/src/test/java/org/apache/whirr/service/puppet/PuppetClusterActionHandlerFactoryTest.java?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/puppet/src/test/java/org/apache/whirr/service/puppet/PuppetClusterActionHandlerFactoryTest.java (original) +++ whirr/trunk/services/puppet/src/test/java/org/apache/whirr/service/puppet/PuppetClusterActionHandlerFactoryTest.java Tue Mar 27 22:00:24 2012 @@ -27,12 +27,12 @@ public class PuppetClusterActionHandlerF @Test public void testPuppetFactoryIsRegisteredAndWorksWithModules() { - assertEquals(new HandlerMapFactory().create().get("puppet:nginx"), new PuppetClusterActionHandler("nginx")); + assertEquals(new HandlerMapFactory().create().getUnchecked("puppet:nginx"), new PuppetClusterActionHandler("nginx")); } @Test public void testPuppetFactoryIsRegisteredAndWorksWithManifests() { - assertEquals(new HandlerMapFactory().create().get("puppet:postgresql::server"), new PuppetClusterActionHandler( + assertEquals(new HandlerMapFactory().create().getUnchecked("puppet:postgresql::server"), new PuppetClusterActionHandler( "postgresql::server")); } Modified: whirr/trunk/services/puppet/src/test/resources/nginx-with-attribs.txt URL: http://svn.apache.org/viewvc/whirr/trunk/services/puppet/src/test/resources/nginx-with-attribs.txt?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/puppet/src/test/resources/nginx-with-attribs.txt (original) +++ whirr/trunk/services/puppet/src/test/resources/nginx-with-attribs.txt Tue Mar 27 22:00:24 2012 @@ -1,9 +1,9 @@ rm /etc/puppet/manifests/site.pp -cat >> /etc/puppet/manifests/site.pp <<'END_OF_FILE' -node default { -class { 'nginx::server': +cat >> /etc/puppet/manifests/site.pp <<-'END_OF_JCLOUDS_FILE' + node default { + class { 'nginx::server': hostname => foohost, } -} -END_OF_FILE + } +END_OF_JCLOUDS_FILE puppet apply /etc/puppet/manifests/site.pp Modified: whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties URL: http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties?rev=1306027&r1=1306026&r2=1306027&view=diff ============================================================================== --- whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties (original) +++ whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties Tue Mar 27 22:00:24 2012 @@ -22,5 +22,3 @@ whirr.provider=${sys:whirr.test.provider whirr.identity=${sys:whirr.test.identity} whirr.credential=${sys:whirr.test.credential} -whirr.hardware-min-ram=512 -
