Fix API version test skip logic
API tests must be evaluated by min and max
versions, however, we've multiple places
where we don't seem to evaluate the min_version;
this leads to incorrect behavior when test
runners set a different min_version in their
test configuration.
We can also consolidate the decorators and
callables that we have. We attempted this in
the recent past [1], however, we replaced the
callables with calling a decorator method, which
resulted in many tests not being skipped.
This bugfix is currently necessary to get
tests working against stable/ussuri and
stable/train branches.
[1] I0c35aff993e67c1ef44c27580f8c2c829a6275f7
Change-Id: I2eceb1d5fe42b1b779e115a0144a5d9639d3753f
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
diff --git a/manila_tempest_tests/utils.py b/manila_tempest_tests/utils.py
index 650614d..7625460 100644
--- a/manila_tempest_tests/utils.py
+++ b/manila_tempest_tests/utils.py
@@ -95,23 +95,8 @@
return lambda f: f
-def skip_if_microversion_lt(microversion):
- """Decorator for tests that are microversion-specific."""
- if is_microversion_lt(CONF.share.max_api_microversion, microversion):
- reason = ("Skipped. Test requires microversion greater than or "
- "equal to '%s'." % microversion)
- return testtools.skip(reason)
- return lambda f: f
-
-
-def check_skip_if_microversion_lt(microversion):
- if is_microversion_lt(CONF.share.max_api_microversion, microversion):
- reason = ("Skipped. Test requires microversion greater than or "
- "equal to '%s'." % microversion)
- raise testtools.TestCase.skipException(reason)
-
-
def check_skip_if_microversion_not_supported(microversion):
+ """Callable method for tests that are microversion-specific."""
if not is_microversion_supported(microversion):
reason = ("Skipped. Test requires microversion '%s'." % microversion)
raise testtools.TestCase.skipException(reason)