From 99f0f63a8ef23b76e72c6147c12faaf36bec78c3 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 2 Mar 2020 17:07:58 +0100
Subject: [PATCH] fix test setup & improvements

---
 src/collective/contact/core/testing.py                | 1 +
 src/collective/contact/core/tests/test_subscribers.py | 4 ++--
 src/collective/contact/core/utils.py                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/collective/contact/core/testing.py b/src/collective/contact/core/testing.py
index d08fd71f..b66723fc 100644
--- a/src/collective/contact/core/testing.py
+++ b/src/collective/contact/core/testing.py
@@ -31,6 +31,7 @@ def setUpPloneSite(self, portal):
         # # insert some test data
         setRoles(portal, TEST_USER_ID, ['Manager'])
         create_test_contact_data(portal)
+        create_test_held_positions(portal)
 
 
 COLLECTIVE_CONTACT_CORE_FIXTURE = CollectiveContactCoreLayer()
diff --git a/src/collective/contact/core/tests/test_subscribers.py b/src/collective/contact/core/tests/test_subscribers.py
index 03a15fdf..380d173f 100644
--- a/src/collective/contact/core/tests/test_subscribers.py
+++ b/src/collective/contact/core/tests/test_subscribers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf8 -*-
 
-from collective.contact.core.testing import INTEGRATION
+from collective.contact.core.testing import COLLECTIVE_CONTACT_CORE_ACCEPTANCE_TESTING
 from ecreall.helpers.testing.search import BaseSearchTest
 from plone import api
 from plone.app.testing import setRoles
@@ -12,7 +12,7 @@
 
 class TestUtils(unittest.TestCase, BaseSearchTest):
 
-    layer = INTEGRATION
+    layer = COLLECTIVE_CONTACT_CORE_ACCEPTANCE_TESTING
 
     def setUp(self):
         super(TestUtils, self).setUp()
diff --git a/src/collective/contact/core/utils.py b/src/collective/contact/core/utils.py
index 22d06ac1..0d6d2e66 100644
--- a/src/collective/contact/core/utils.py
+++ b/src/collective/contact/core/utils.py
@@ -4,7 +4,7 @@
 from collective.contact.core.interfaces import IHeldPosition
 
 
-def get_gender_and_number(contacts, use_by=False, use_to=False):
+def get_gender_and_number(contacts, use_by=False, use_to=False):  # noqa for now 'is too complex'
     """Return gender and number of given contacts.
        Returns None if not genderable.
        Returns a 2 letters code if genderable: