events: rename event_type to events_types as it's multiple

rhodecode/tests/events/conftest.py

@@ -1,41 +1,41 b''
 # Copyright (C) 2016-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import mock
 import decorator
 
 
 class EventCatcher(object):
     """ Testing context manager to check if events are fired """
 
     def __init__(self):
         self.events = [] # the actual events captured
-        self.event_types = [] # the types of events captured
+        self.events_types = [] # the types of events captured
 
     def __enter__(self):
         self.event_trigger_patch = mock.patch('rhodecode.events.trigger')
         self.mocked_event_trigger = self.event_trigger_patch.start()
         return self
 
     def __exit__(self, type_, value, traceback):
         self.event_trigger_patch.stop()
 
         for call in self.mocked_event_trigger.call_args_list:
             event = call[0][0]
             self.events.append(event)
-            self.event_types.append(type(event))
+            self.events_types.append(type(event))

rhodecode/tests/events/test_repo.py

@@ -1,79 +1,79 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
 
 from rhodecode.tests.events.conftest import EventCatcher
 
 from rhodecode.lib import hooks_base, utils2
 from rhodecode.model.repo import RepoModel
 from rhodecode.events.repo import (
     RepoPrePullEvent, RepoPullEvent,
     RepoPrePushEvent, RepoPushEvent,
     RepoPreCreateEvent, RepoCreatedEvent,
     RepoPreDeleteEvent, RepoDeletedEvent,
 )
 
 
 @pytest.fixture
 def scm_extras(user_regular, repo_stub):
     extras = utils2.AttributeDict({
         'ip': '127.0.0.1',
         'username': user_regular.username,
         'action': '',
         'repository': repo_stub.repo_name,
         'scm': repo_stub.scm_instance().alias,
         'config': '',
         'server_url': 'http://example.com',
         'make_lock': None,
         'locked_by': [None],
         'commit_ids': ['a' * 40] * 3,
     })
     return extras
 
 
 def test_create_delete_repo_fires_events(backend):
     with EventCatcher() as event_catcher:
         repo = backend.create_repo()
-    assert event_catcher.event_types == [RepoPreCreateEvent, RepoCreatedEvent]
+    assert event_catcher.events_types == [RepoPreCreateEvent, RepoCreatedEvent]
 
     with EventCatcher() as event_catcher:
         RepoModel().delete(repo)
-    assert event_catcher.event_types == [RepoPreDeleteEvent, RepoDeletedEvent]
+    assert event_catcher.events_types == [RepoPreDeleteEvent, RepoDeletedEvent]
 
 
 def test_pull_fires_events(scm_extras):
     with EventCatcher() as event_catcher:
         hooks_base.pre_push(scm_extras)
-    assert event_catcher.event_types == [RepoPrePushEvent]
+    assert event_catcher.events_types == [RepoPrePushEvent]
 
     with EventCatcher() as event_catcher:
         hooks_base.post_push(scm_extras)
-    assert event_catcher.event_types == [RepoPushEvent]
+    assert event_catcher.events_types == [RepoPushEvent]
 
 
 def test_push_fires_events(scm_extras):
     with EventCatcher() as event_catcher:
         hooks_base.pre_pull(scm_extras)
-    assert event_catcher.event_types == [RepoPrePullEvent]
+    assert event_catcher.events_types == [RepoPrePullEvent]
 
     with EventCatcher() as event_catcher:
         hooks_base.post_pull(scm_extras)
-    assert event_catcher.event_types == [RepoPullEvent]
+    assert event_catcher.events_types == [RepoPullEvent]