Allon Mureinik has uploaded a new change for review.

Change subject: core: StoragePoolValidatorTest config mocking
......................................................................

core: StoragePoolValidatorTest config mocking

Removed redundant mocking that's not used in the test and streamlined
the existing mocking to use two version - 3.0 as an "old" version which
does not support new features and 3.1 and a "new" version which does.

Related-To: https://bugzilla.redhat.com/1127590
Change-Id: If916e1080686ec037dba6f79264307e73b1502d2
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
1 file changed, 3 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/31266/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
index a0786e3..cd8ecc6 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java
@@ -21,12 +21,8 @@
 
     @ClassRule
     public static MockConfigRule mce = new MockConfigRule
-            (mockConfig(ConfigValues.PosixStorageEnabled, 
Version.v3_1.toString(), true),
+            (mockConfig(ConfigValues.PosixStorageEnabled, 
Version.v3_3.toString(), true),
                     mockConfig(ConfigValues.PosixStorageEnabled, 
Version.v3_0.toString(), false),
-                    mockConfig(ConfigValues.PosixStorageEnabled, 
Version.v2_2.toString(), false),
-                    mockConfig(ConfigValues.PosixStorageEnabled, "general", 
false),
-                    mockConfig(ConfigValues.GlusterFsStorageEnabled, 
Version.v3_1.toString(), false),
-                    mockConfig(ConfigValues.GlusterFsStorageEnabled, 
Version.v3_2.toString(), false),
                     mockConfig(ConfigValues.GlusterFsStorageEnabled, 
Version.v3_0.toString(), false),
                     mockConfig(ConfigValues.GlusterFsStorageEnabled, 
Version.v3_3.toString(), true));
 
@@ -42,7 +38,7 @@
 
     @Test
     public void testPosixDcAndMatchingCompatiblityVersion() {
-        storagePool.setcompatibility_version(Version.v3_1);
+        storagePool.setcompatibility_version(Version.v3_3);
         storagePool.setIsLocal(false);
         assertThat(validator.isPosixSupportedInDC(), isValid());
     }
@@ -64,7 +60,7 @@
 
     @Test
     public void testGlusterDcAndNotMatchingCompatiblityVersion() {
-        storagePool.setcompatibility_version(Version.v3_1);
+        storagePool.setcompatibility_version(Version.v3_0);
         storagePool.setIsLocal(false);
         assertThat(validator.isGlusterSupportedInDC(),
                 
failsWith(VdcBllMessages.DATA_CENTER_GLUSTER_STORAGE_NOT_SUPPORTED_IN_CURRENT_VERSION));


-- 
To view, visit http://gerrit.ovirt.org/31266
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If916e1080686ec037dba6f79264307e73b1502d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to