mirror of https://github.com/apache/jclouds.git
WindowsClientLiveTest wasn't running due to lack of BouncyCastleCryptoModule and a problem with the test properties
This commit is contained in:
parent
a03565003f
commit
f66cd71b49
|
@ -22,12 +22,15 @@ import static org.testng.Assert.assertEquals;
|
||||||
import static org.testng.Assert.assertFalse;
|
import static org.testng.Assert.assertFalse;
|
||||||
import static org.testng.Assert.assertTrue;
|
import static org.testng.Assert.assertTrue;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
import com.google.inject.Module;
|
||||||
import org.jclouds.compute.ComputeService;
|
import org.jclouds.compute.ComputeService;
|
||||||
import org.jclouds.compute.domain.NodeMetadata;
|
import org.jclouds.compute.domain.NodeMetadata;
|
||||||
import org.jclouds.compute.domain.OsFamily;
|
import org.jclouds.compute.domain.OsFamily;
|
||||||
|
@ -41,6 +44,7 @@ import org.jclouds.ec2.compute.functions.WindowsLoginCredentialsFromEncryptedDat
|
||||||
import org.jclouds.ec2.domain.InstanceType;
|
import org.jclouds.ec2.domain.InstanceType;
|
||||||
import org.jclouds.ec2.domain.PasswordData;
|
import org.jclouds.ec2.domain.PasswordData;
|
||||||
import org.jclouds.ec2.reference.EC2Constants;
|
import org.jclouds.ec2.reference.EC2Constants;
|
||||||
|
import org.jclouds.encryption.bouncycastle.config.BouncyCastleCryptoModule;
|
||||||
import org.jclouds.predicates.RetryablePredicate;
|
import org.jclouds.predicates.RetryablePredicate;
|
||||||
import org.testng.annotations.BeforeClass;
|
import org.testng.annotations.BeforeClass;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
@ -57,7 +61,7 @@ import com.google.common.collect.Iterables;
|
||||||
@Test(groups = "live", singleThreaded = true, testName = "WindowsClientLiveTest")
|
@Test(groups = "live", singleThreaded = true, testName = "WindowsClientLiveTest")
|
||||||
public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
|
public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
|
||||||
public WindowsClientLiveTest() {
|
public WindowsClientLiveTest() {
|
||||||
provider = "ec2";
|
provider = "aws-ec2";
|
||||||
}
|
}
|
||||||
|
|
||||||
private ComputeService computeService;
|
private ComputeService computeService;
|
||||||
|
@ -80,7 +84,15 @@ public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
|
||||||
computeService = view.getComputeService();
|
computeService = view.getComputeService();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Iterable<Module> setupModules() {
|
||||||
|
Iterable<Module> superModules = super.setupModules();
|
||||||
|
List<Module> modules = new ArrayList<Module>();
|
||||||
|
Iterables.addAll(modules, superModules);
|
||||||
|
modules.add(new BouncyCastleCryptoModule());
|
||||||
|
return modules;
|
||||||
|
}
|
||||||
|
|
||||||
@Test(enabled = false)
|
@Test(enabled = false)
|
||||||
// TODO get instance
|
// TODO get instance
|
||||||
public void testBundleInstanceInRegion() {
|
public void testBundleInstanceInRegion() {
|
||||||
|
|
Loading…
Reference in New Issue