Permalink
Browse files

fixed cloudservers expectations

  • Loading branch information...
Adrian Cole
Adrian Cole committed Jun 1, 2012
1 parent 160cd27 commit f122aeadd8b4a71d24211d136a7d43a2c1b48e30
@@ -52,12 +52,12 @@ public CloudServersUSTemplateBuilderLiveTest() {
public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) {
case UBUNTU:
- return (input.version.equals("") || input.version.equals("10.04") || input.version.startsWith("11"))
+ return (input.version.equals("") || input.version.matches("1[012].04") || input.version.startsWith("11"))
&& input.is64Bit;
case DEBIAN:
return input.is64Bit && !input.version.equals("5.0");
case CENTOS:
- return (input.version.equals("") || input.version.equals("5.6") || input.version.equals("6.0"))
+ return (input.version.equals("") || input.version.matches("5.[60]") || input.version.equals("6.0"))
&& input.is64Bit;
case WINDOWS:
return input.version.equals("2008 SP2") || input.version.equals("")
@@ -74,7 +74,7 @@ public boolean apply(OsFamilyVersion64Bit input) {
public void testTemplateBuilder() {
Template defaultTemplate = this.view.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.10");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), provider);
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);

0 comments on commit f122aea

Please sign in to comment.