Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed template test when there's no password supplied

This commit is contained in:
Adrian Cole 2011-11-17 16:11:00 +02:00
parent 2e675f0fbc
commit a377fe04a0
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compute/src/test/java/org/jclouds/compute/BaseTemplateBuilderLiveTest.java
View File

@ -257,39 +257,29 @@ public abstract class BaseTemplateBuilderLiveTest extends BaseVersionedServiceLi
@Test
public void testTemplateBuilderWithLoginUserSpecified() throws IOException {
tryOverrideUsingPropertyKey("jclouds.login-user");
tryOverrideUsingPropertyKey(provider + ".login-user");
}
protected void tryOverrideUsingPropertyKey(String propertyKey) {
ComputeServiceContext context = null;
try {
Properties overrides = setupProperties();
String login = loginUser != null ? loginUser : "foo:bar";
overrides.setProperty("jclouds.login-user", login);
overrides.setProperty(propertyKey, login);
context = new ComputeServiceContextFactory().createContext(provider,
ImmutableSet.<Module> of(new Log4JLoggingModule()), overrides);
Iterable<String> userPass = Splitter.on(':').split(login);
String user = Iterables.get(userPass, 0);
String pass = Iterables.get(userPass, 1);
String pass = Iterables.size(userPass) > 1 ? Iterables.get(userPass, 1) : null;
assertEquals(context.getComputeService().templateBuilder().build().getImage().getDefaultCredentials(),
new Credentials(user, pass));
} finally {
if (context != null)
context.close();
}
context = null;
try {
Properties overrides = setupProperties();
overrides.setProperty(provider + ".login-user", "foo:bar");
context = new ComputeServiceContextFactory().createContext(provider,
ImmutableSet.<Module> of(new Log4JLoggingModule()), overrides);
assertEquals(context.getComputeService().templateBuilder().build().getImage().getDefaultCredentials(),
new Credentials("foo", "bar"));
} finally {
if (context != null)
context.close();
}
}
void assertProvider(Location provider) {