cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: updated refs/heads/4.9 to 8d506a6
Date Tue, 06 Dec 2016 06:27:15 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9 48b28f7d6 -> 8d506a624


CLOUDSTACK-9564: Fix NPE due to intermittent test assertion

The test assertion on a pool object may return a null object, as objects
can be randomly expired/tombstoned. This will fix a NPE sometimes seen due
to recently merge for the fix for CLOUDSTACK-9564.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dcbf3c86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dcbf3c86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dcbf3c86

Branch: refs/heads/4.9
Commit: dcbf3c8689ed3eaed8653763ec27d2907671c72b
Parents: 48b28f7
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon Dec 5 16:45:33 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Dec 5 16:45:33 2016 +0530

----------------------------------------------------------------------
 .../com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java    | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dcbf3c86/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java
----------------------------------------------------------------------
diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java
b/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java
index 5b8d47d..0c365db 100644
--- a/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java
+++ b/vmware-base/test/com/cloud/hypervisor/vmware/util/VmwareContextPoolTest.java
@@ -114,7 +114,5 @@ public class VmwareContextPoolTest {
             totalRegistrations += client.count();
         }
         Mockito.verify(vmwareContextPool, Mockito.atLeast(totalRegistrations)).registerContext(Mockito.any(VmwareContext.class));
-        Assert.assertEquals(vmwareContextPool.composePoolKey(vmwareAddress, vmwareUsername),
-                vmwareContextPool.getContext(vmwareAddress, vmwareUsername).getPoolKey());
     }
 }
\ No newline at end of file


Mime
View raw message