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

trmk stabilization

This commit is contained in:
Adrian Cole 2011-05-29 20:46:42 -07:00
parent 9046324853
commit b14626b4cf
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/trmk/src/test/java/org/jclouds/vcloud/terremark/TerremarkClientLiveTest.java
View File

@ -379,8 +379,6 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
assertEquals(vApp.getOperatingSystemDescription(), expectedOs); assertEquals(vApp.getOperatingSystemDescription(), expectedOs);
assertEquals((int) find(vApp.getResourceAllocations(), CIMPredicates.resourceTypeIn(ResourceType.PROCESSOR)) assertEquals((int) find(vApp.getResourceAllocations(), CIMPredicates.resourceTypeIn(ResourceType.PROCESSOR))
.getVirtualQuantity().longValue(), processorCount); .getVirtualQuantity().longValue(), processorCount);
assertEquals((int) find(vApp.getResourceAllocations(),
CIMPredicates.resourceTypeIn(ResourceType.PARALLEL_SCSI_HBA)).getVirtualQuantity().longValue(), 1);
assertEquals(find(vApp.getResourceAllocations(), CIMPredicates.resourceTypeIn(ResourceType.MEMORY)) assertEquals(find(vApp.getResourceAllocations(), CIMPredicates.resourceTypeIn(ResourceType.MEMORY))
.getVirtualQuantity().longValue(), memory); .getVirtualQuantity().longValue(), memory);
assertEquals(find(vApp.getResourceAllocations(), CIMPredicates.resourceTypeIn(ResourceType.DISK_DRIVE)) assertEquals(find(vApp.getResourceAllocations(), CIMPredicates.resourceTypeIn(ResourceType.DISK_DRIVE))

4
compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
View File

@ -96,7 +96,7 @@ import com.google.inject.Module;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = { "integration", "live" }, sequential = true) @Test(groups = { "integration", "live" }, singleThreaded = true)
public abstract class BaseComputeServiceLiveTest { public abstract class BaseComputeServiceLiveTest {
protected String group; protected String group;
@ -579,7 +579,7 @@ public abstract class BaseComputeServiceLiveTest {
assert node.getState() != NodeState.RUNNING; assert node.getState() != NodeState.RUNNING;
long duration = System.currentTimeMillis() - time; long duration = System.currentTimeMillis() - time;
assert duration < nonBlockDuration : String.format("duration(%d) longer than expected(%d) seconds! ", assert duration < nonBlockDuration : String.format("duration(%d) longer than expected(%d) seconds! ",
nonBlockDuration, duration / 1000); duration / 1000, nonBlockDuration);
} finally { } finally {
client.destroyNodesMatching(inGroup(group)); client.destroyNodesMatching(inGroup(group));
} }