From 8d0d5cb96349226a6c49a868ef933440bc6c6f2c Mon Sep 17 00:00:00 2001 From: Shawn Falkner-Horine Date: Wed, 10 Sep 2014 12:49:20 -0700 Subject: [PATCH] Tests: Fixed 'requires_boto_gte' to apply to target test only. --- tests/helpers.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/helpers.py b/tests/helpers.py index 0f8df72fe..6cc38f5d5 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -8,6 +8,11 @@ def version_tuple(v): return tuple(map(int, (v.split(".")))) +# Note: See https://github.com/spulec/moto/issues/201 for why this is a separate method. +def skip_test(): + raise SkipTest + + class requires_boto_gte(object): """Decorator for requiring boto version greater than or equal to 'version'""" def __init__(self, version): @@ -18,7 +23,7 @@ class requires_boto_gte(object): required = version_tuple(self.version) if boto_version >= required: return test - raise SkipTest + return skip_test class py3_requires_boto_gte(object): @@ -34,4 +39,4 @@ class py3_requires_boto_gte(object): required = version_tuple(self.version) if boto_version >= required: return test - raise SkipTest + return skip_test