Skip to content
Browse files

Removed syspropertyset passage of properties in the ec2testing-junit …

…Ant task. Also allowing overrides of the properties from the EC2 properties file via system properties
  • Loading branch information...
1 parent 85e7bd3 commit 297243de3b890009b5a5b3e2a2a780560f1b393a @kirktrue kirktrue committed with afeinberg Nov 18, 2009
Showing with 6 additions and 3 deletions.
  1. +0 −2 build.xml
  2. +6 −1 contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java
View
2 build.xml
@@ -239,8 +239,6 @@
<junit printsummary="yes" maxmemory="1024m" showoutput="true" failureProperty="test.failure">
<syspropertyset>
<propertyref prefix="ec2" />
- <propertyref prefix="log4j" />
- <propertyref prefix="org.apache.commons.logging" />
</syspropertyset>
<classpath refid="contrib-test-classpath" />
<formatter type="xml" />
View
7 contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java
@@ -276,10 +276,15 @@ private static Properties getEc2Properties() throws Exception {
IOUtils.closeQuietly(r);
}
- for(String required: requireds)
+ for(String required: requireds) {
+ // Allow system properties to override
+ if(System.getProperties().containsKey(required))
+ properties.put(required, System.getProperty(required));
+
if(!properties.containsKey(required))
throw new Exception("Required properties for Ec2SmokeTest: "
+ StringUtils.join(requireds, ", ") + "; missing " + required);
+ }
return properties;
}

0 comments on commit 297243d

Please sign in to comment.
Something went wrong with that request. Please try again.