Merge cab6a39 into 43012df

collective · Jan 30, 2017 · 5f01a11 · 5f01a11
2 parents 43012df + cab6a39
commit 5f01a11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/collective/behavior/featuredimage/testing.py b/src/collective/behavior/featuredimage/testing.py
@@ -16,7 +16,7 @@
 
 import os
 
-PLONE_VERSION = api.env.plone_version()
+IS_PLONE_5 = api.env.plone_version().startswith('5')
 
 
 def get_encoded_image(filename):

diff --git a/src/collective/behavior/featuredimage/tests/test_robot.py b/src/collective/behavior/featuredimage/tests/test_robot.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from collective.behavior.featuredimage.testing import IS_PLONE_5
 from collective.behavior.featuredimage.testing import ROBOT_TESTING
 from plone.testing import layered
 
@@ -7,15 +8,17 @@
 import unittest
 
 
+dirname = os.path.dirname(__file__)
+files = os.listdir(dirname)
+tests = [f for f in files if f.startswith('test_') and f.endswith('.robot')]
+
+# skip RobotFramework tests in Plone 5
+if IS_PLONE_5:
+    tests = []
+
+
 def test_suite():
     suite = unittest.TestSuite()
-    current_dir = os.path.abspath(os.path.dirname(__file__))
-    tests = [
-        doc for doc in os.listdir(current_dir)
-        if doc.startswith('test_') and doc.endswith('.robot')
-    ]
-    # XXX: skip all RF tests meanwhiled
-    tests = []
     suite.addTests([
         layered(
             robotsuite.RobotTestSuite(t, noncritical=['Expected Failure']),