diff --git a/src/collective/taskqueue2/configure.zcml b/src/collective/taskqueue2/configure.zcml index 7060ac5..f97172c 100644 --- a/src/collective/taskqueue2/configure.zcml +++ b/src/collective/taskqueue2/configure.zcml @@ -48,7 +48,4 @@ - - - diff --git a/src/collective/taskqueue2/example/configure.zcml b/src/collective/taskqueue2/example/configure.zcml deleted file mode 100644 index 8039688..0000000 --- a/src/collective/taskqueue2/example/configure.zcml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/src/collective/taskqueue2/example/queue_async_task.py b/src/collective/taskqueue2/example/queue_async_task.py deleted file mode 100644 index e0091ff..0000000 --- a/src/collective/taskqueue2/example/queue_async_task.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- - -from Products.Five.browser import BrowserView -from zope.interface import implementer -from zope.interface import Interface - - -class IQueueAsyncTask(Interface): - """Marker Interface for IQueueAsyncTask""" - - -@implementer(IQueueAsyncTask) -class QueueAsyncTask(BrowserView): - def __call__(self): - template = """
  • - Sample View -
    • """ - return template diff --git a/src/collective/taskqueue2/example/sample_plone_view.pt b/src/collective/taskqueue2/example/sample_plone_view.pt deleted file mode 100644 index 56eb7c0..0000000 --- a/src/collective/taskqueue2/example/sample_plone_view.pt +++ /dev/null @@ -1,57 +0,0 @@ - - - - -

    - - - - - - - - - -

    - - - - - - - -

    - -
    -
    -
    - - -
    - -
    - -
    -
    -
    -
    - - - - - - diff --git a/src/collective/taskqueue2/example/sample_plone_view.py b/src/collective/taskqueue2/example/sample_plone_view.py deleted file mode 100644 index c6716b8..0000000 --- a/src/collective/taskqueue2/example/sample_plone_view.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- - -# from collective.taskqueue2 import _ -from plone.dexterity.browser.view import DefaultView -from zope.interface import implementer -from zope.interface import Interface - - -# from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile - - -class ISamplePloneView(Interface): - """Marker Interface for ISamplePloneView""" - - -@implementer(ISamplePloneView) -class SamplePloneView(DefaultView): - # If you want to define a template here, please remove the template from - # the configure.zcml registration of this view. - # template = ViewPageTemplateFile('sample_plone_view.pt') - - def __call__(self): - # Implement your own actions: - return super(SamplePloneView, self).__call__() diff --git a/src/collective/taskqueue2/huey_consumer.py b/src/collective/taskqueue2/huey_consumer.py index 9ac6f0a..aaec97b 100644 --- a/src/collective/taskqueue2/huey_consumer.py +++ b/src/collective/taskqueue2/huey_consumer.py @@ -8,10 +8,11 @@ # This import must remain in place in order to register the Huey tasks during # startup !!! Don't remove, required for task registration! import collective.taskqueue2.huey_tasks # noqa: F401 + import os -import pprint import signal import threading +import pprint # monkey-patch huey signal handler for integration with Zope diff --git a/src/collective/taskqueue2/tests/test_view_queue_async_task.py b/src/collective/taskqueue2/tests/test_view_queue_async_task.py deleted file mode 100644 index 681a9d7..0000000 --- a/src/collective/taskqueue2/tests/test_view_queue_async_task.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -from collective.taskqueue2.testing import COLLECTIVE_TASKQUEUE2_FUNCTIONAL_TESTING -from collective.taskqueue2.testing import COLLECTIVE_TASKQUEUE2_INTEGRATION_TESTING -from collective.taskqueue2.views.queue_async_task import IQueueAsyncTask -from plone import api -from plone.app.testing import setRoles -from plone.app.testing import TEST_USER_ID -from zope.component import getMultiAdapter -from zope.interface.interfaces import ComponentLookupError - -import unittest - - -class ViewsIntegrationTest(unittest.TestCase): - - layer = COLLECTIVE_TASKQUEUE2_INTEGRATION_TESTING - - def setUp(self): - self.portal = self.layer["portal"] - setRoles(self.portal, TEST_USER_ID, ["Manager"]) - api.content.create(self.portal, "Folder", "other-folder") - api.content.create(self.portal, "Document", "front-page") - - def test_queue_async_task_is_registered(self): - view = getMultiAdapter( - (self.portal["other-folder"], self.portal.REQUEST), name="queue-async-task" - ) - self.assertTrue(IQueueAsyncTask.providedBy(view)) - - def test_queue_async_task_not_matching_interface(self): - view_found = True - try: - view = getMultiAdapter( - (self.portal["front-page"], self.portal.REQUEST), - name="queue-async-task", - ) - except ComponentLookupError: - view_found = False - else: - view_found = IQueueAsyncTask.providedBy(view) - self.assertFalse(view_found) - - -class ViewsFunctionalTest(unittest.TestCase): - - layer = COLLECTIVE_TASKQUEUE2_FUNCTIONAL_TESTING - - def setUp(self): - self.portal = self.layer["portal"] - setRoles(self.portal, TEST_USER_ID, ["Manager"]) diff --git a/src/collective/taskqueue2/tests/test_view_sample_plone_view.py b/src/collective/taskqueue2/tests/test_view_sample_plone_view.py deleted file mode 100644 index 1f93b64..0000000 --- a/src/collective/taskqueue2/tests/test_view_sample_plone_view.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -from collective.taskqueue2.testing import COLLECTIVE_TASKQUEUE2_FUNCTIONAL_TESTING -from collective.taskqueue2.testing import COLLECTIVE_TASKQUEUE2_INTEGRATION_TESTING -from collective.taskqueue2.views.sample_plone_view import ISamplePloneView -from plone import api -from plone.app.testing import setRoles -from plone.app.testing import TEST_USER_ID -from zope.component import getMultiAdapter -from zope.interface.interfaces import ComponentLookupError - -import unittest - - -class ViewsIntegrationTest(unittest.TestCase): - - layer = COLLECTIVE_TASKQUEUE2_INTEGRATION_TESTING - - def setUp(self): - self.portal = self.layer["portal"] - setRoles(self.portal, TEST_USER_ID, ["Manager"]) - api.content.create(self.portal, "Folder", "other-folder") - api.content.create(self.portal, "Document", "front-page") - - def test_sample_plone_view_is_registered(self): - view = getMultiAdapter( - (self.portal["other-folder"], self.portal.REQUEST), name="sample-plone-view" - ) - self.assertTrue(ISamplePloneView.providedBy(view)) - - def test_sample_plone_view_not_matching_interface(self): - view_found = True - try: - view = getMultiAdapter( - (self.portal["front-page"], self.portal.REQUEST), - name="sample-plone-view", - ) - except ComponentLookupError: - view_found = False - else: - view_found = ISamplePloneView.providedBy(view) - self.assertFalse(view_found) - - -class ViewsFunctionalTest(unittest.TestCase): - - layer = COLLECTIVE_TASKQUEUE2_FUNCTIONAL_TESTING - - def setUp(self): - self.portal = self.layer["portal"] - setRoles(self.portal, TEST_USER_ID, ["Manager"])