Change in vdsm[master]: toolTests: change boolean logic.
mtayer at redhat.com
mtayer at redhat.com
Sun Oct 12 14:22:54 UTC 2014
mooli tayer has uploaded a new change for review.
Change subject: toolTests: change boolean logic.
......................................................................
toolTests: change boolean logic.
1. change should_fail to should_succeed.
2. change
if !should_fail:
return True
return False
to:
return should_succeed
Change-Id: I6362c94ceee397908b03b5267363091ce892d024
Signed-off-by: Mooli Tayer <mtayer at redhat.com>
---
M tests/toolTests.py
1 file changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/34042/1
diff --git a/tests/toolTests.py b/tests/toolTests.py
index 65b7adc..376f5ad 100644
--- a/tests/toolTests.py
+++ b/tests/toolTests.py
@@ -43,10 +43,10 @@
class MockModuleConfigurator(ModuleConfigure):
- def __init__(self, name, requires=(), should_fail=False):
+ def __init__(self, name, requires=(), should_succeed=True):
self._name = name
self._requires = frozenset(requires)
- self._should_fail = should_fail
+ self.should_succeed = should_succeed
@property
def name(self):
@@ -60,21 +60,19 @@
return "name: %s, requires: %s" % (self._name, self._requires)
def validate(self):
- if self._should_fail:
- return False
- return True
+ return self.should_succeed
def isconfigured(self):
- if self._should_fail:
- return NOT_CONFIGURED
- return CONFIGURED
+ if self.should_succeed:
+ return CONFIGURED
+ return NOT_CONFIGURED
def configure(self):
- if self._should_fail:
+ if not self.should_succeed:
raise InvalidRun('mock for invalid configure')
def removeConf(self):
- if self._should_fail:
+ if not self.should_succeed:
raise Exception('mock invalid remove conf')
@@ -189,8 +187,8 @@
configurator,
'_CONFIGURATORS',
{
- 'a': MockModuleConfigurator('a', should_fail=True),
- 'b': MockModuleConfigurator('b', should_fail=True),
+ 'a': MockModuleConfigurator('a', should_succeed=False),
+ 'b': MockModuleConfigurator('b', should_succeed=False),
}
)
def testFailuresOnExposedFuncs(self):
--
To view, visit http://gerrit.ovirt.org/34042
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6362c94ceee397908b03b5267363091ce892d024
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mtayer at redhat.com>
More information about the vdsm-patches
mailing list