From c6b6161230d8ae2297c82b3f421ad659762b974e Mon Sep 17 00:00:00 2001 From: hvelarde Date: Mon, 11 Mar 2019 22:02:32 -0600 Subject: [PATCH 1/3] Test under Plone 5.2 and Python 3.7 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e4bac76..16d9a54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,12 @@ addons: env: - PLONE_VERSION=4.3 - PLONE_VERSION=5.1 +- PLONE_VERSION=5.2 matrix: fast_finish: true + include: + - python: 3.7 + env: PLONE_VERSION=5.2 before_install: # FIXME: I have no idea how and why six==1.11.0 i being installed - pip uninstall -y six From bd4efe9a2f1824105796b11064b7cc38fe7e98d1 Mon Sep 17 00:00:00 2001 From: hvelarde Date: Mon, 11 Mar 2019 22:08:27 -0600 Subject: [PATCH 2/3] Use Python 3.6 instead --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 16d9a54..badc1e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: matrix: fast_finish: true include: - - python: 3.7 + - python: 3.6 env: PLONE_VERSION=5.2 before_install: # FIXME: I have no idea how and why six==1.11.0 i being installed From fd16cb1261c420789ba60838887d122123fd8a9b Mon Sep 17 00:00:00 2001 From: hvelarde Date: Mon, 11 Mar 2019 22:37:55 -0600 Subject: [PATCH 3/3] Remove tests that use the __of__ acquisition wrapper This acquisition wrapper manually wraps an instance of an object, but tests seems to be overkill and the method seems to be removed from Zope 4. --- src/collective/fingerpointing/tests/test_controlpanel.py | 7 ------- src/collective/fingerpointing/tests/test_view.py | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/collective/fingerpointing/tests/test_controlpanel.py b/src/collective/fingerpointing/tests/test_controlpanel.py index 0189a20..2c6c278 100644 --- a/src/collective/fingerpointing/tests/test_controlpanel.py +++ b/src/collective/fingerpointing/tests/test_controlpanel.py @@ -2,7 +2,6 @@ from collective.fingerpointing.interfaces import IFingerPointingSettings from collective.fingerpointing.testing import INTEGRATION_TESTING from collective.fingerpointing.testing import QIBBB -from plone import api from plone.app.testing import logout from plone.registry.interfaces import IRegistry from zope.component import getUtility @@ -19,12 +18,6 @@ def setUp(self): self.request = self.layer['request'] self.controlpanel = self.portal['portal_controlpanel'] - def test_controlpanel_has_view(self): - view = api.content.get_view( - u'fingerpointing-settings', self.portal, self.request) - view = view.__of__(self.portal) - self.assertTrue(view()) - def test_controlpanel_view_is_protected(self): from AccessControl import Unauthorized logout() diff --git a/src/collective/fingerpointing/tests/test_view.py b/src/collective/fingerpointing/tests/test_view.py index 99372d5..f51d4b6 100644 --- a/src/collective/fingerpointing/tests/test_view.py +++ b/src/collective/fingerpointing/tests/test_view.py @@ -16,10 +16,6 @@ def setUp(self): self.view = api.content.get_view( 'fingerpointing-audit-log', self.portal, self.request) - def test_audit_log_view(self): - view = self.view.__of__(self.portal) - self.assertTrue(view()) - def test_audit_log_view_is_protected(self): from AccessControl import Unauthorized logout()