# HG changeset patch # User Marcin Kuzminski # Date 2017-02-14 11:02:50 # Node ID 0bf8c0ea8fee83b6f431c08c09cb2e0576f2aefb # Parent 64eeaebf1e97629704e95fca09139fcb2ee2afa9 tests: improved test utils. - better assert errors - allow owner to be set consistently diff --git a/rhodecode/tests/plugin.py b/rhodecode/tests/plugin.py --- a/rhodecode/tests/plugin.py +++ b/rhodecode/tests/plugin.py @@ -1170,11 +1170,14 @@ class UserUtility(object): user_group = self.create_user_group(members=[user]) return user, user_group - def create_user_group(self, members=None, auto_cleanup=True, **kwargs): + def create_user_group(self, owner=TEST_USER_ADMIN_LOGIN, members=None, + auto_cleanup=True, **kwargs): group_name = "{prefix}_usergroup_{count}".format( prefix=self._test_name, count=len(self.user_group_ids)) - user_group = self.fixture.create_user_group(group_name, **kwargs) + user_group = self.fixture.create_user_group( + group_name, cur_user=owner, **kwargs) + if auto_cleanup: self.user_group_ids.append(user_group.users_group_id) if members: diff --git a/rhodecode/tests/utils.py b/rhodecode/tests/utils.py --- a/rhodecode/tests/utils.py +++ b/rhodecode/tests/utils.py @@ -241,14 +241,14 @@ class AssertResponse(object): doc = fromstring(self.response.body) sel = CSSSelector('#' + anchor_id) elements = sel(doc) - assert len(elements) == 1 + assert len(elements) == 1, 'cannot find 1 element {}'.format(anchor_id) def _ensure_url_equal(self, found, expected): assert _Url(found) == _Url(expected) def get_element(self, css_selector): elements = self._get_elements(css_selector) - assert len(elements) == 1 + assert len(elements) == 1, 'cannot find 1 element {}'.format(css_selector) return elements[0] def get_elements(self, css_selector):