cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.9 to 25b6990
Date Thu, 03 Nov 2016 04:13:05 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9 b75e69581 -> 25b6990e2


server: Fix build regression caused by 32a39

A constructor signature has changed between 4.8 and 4.9+ branches which caused
failure in a unit test introduced by PR #1694. This fixes the unit test by
passing null as the additional parameter (the test does not need instantiated
object).

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/25b6990e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25b6990e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25b6990e

Branch: refs/heads/4.9
Commit: 25b6990e222cbfb523d6db6d388985ca90847aaf
Parents: b75e695
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Thu Nov 3 09:11:11 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Nov 3 09:14:35 2016 +0530

----------------------------------------------------------------------
 server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25b6990e/server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java b/server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java
index 06733f4..0200966 100644
--- a/server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java
+++ b/server/test/com/cloud/storage/listener/StoragePoolMonitorTest.java
@@ -46,7 +46,7 @@ public class StoragePoolMonitorTest {
         storageManager = Mockito.mock(StorageManagerImpl.class);
         poolDao = Mockito.mock(PrimaryDataStoreDao.class);
 
-        storagePoolMonitor = new StoragePoolMonitor(storageManager, poolDao);
+        storagePoolMonitor = new StoragePoolMonitor(storageManager, poolDao, null);
         host = new HostVO("some-uuid");
         pool = new StoragePoolVO();
         pool.setScope(ScopeType.CLUSTER);


Mime
View raw message