Mercurial > kallithea

changeset 5906:712a32f1026b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: api: fix intertest dependency on repository locking In test classes based on unittest, tests are executed in alphabetical order. In test classes based on pytest, tests are executed in the order they are specified. This difference revealed a problem in the API tests: - test_api_lock_repo_lock_optional_locked locks the test repository - test_api_get_locks_regular_user gets the current locks and expects it to be empty With unittest as base class, this worked fine because the 'get_locks' group of tests are executed before the 'lock_repo' group (alphabetical order). Using a real pytest-based test class, the order is swapped and the locked repository from the first test invalidates the preconditions of the second test. Fix this specific problem by releasing the lock from test_api_lock_repo_lock_optional_locked. This commit does not fix other interdependencies between tests. For example, test_api_lock_repo_lock_optional_locked expects the existing lock state to be 'locked' but did not lock the repo itself; instead it expects a previous test to have locked. In practice, this is test_api_lock_repo_lock_aquire_optional_userid. A full solution would make each test fully self contained so that tests can be executed in random order. The pytest extension pytest-random can help detecting these problems.
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Wed, 04 May 2016 08:53:35 +0200
parents bf8898a112b2
children 526724b8b6ce
files kallithea/tests/api/api_base.py
diffstat 1 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/api/api_base.py	Sun May 01 23:29:33 2016 +0200
+++ b/kallithea/tests/api/api_base.py	Wed May 04 08:53:35 2016 +0200
@@ -448,21 +448,25 @@
         self._compare_ok(id_, expected, given=response.body)
 
     def test_api_lock_repo_lock_optional_locked(self):
-        id_, params = _build_data(self.apikey, 'lock',
-                                  repoid=self.REPO)
-        response = api_call(self, params)
-        time_ = response.json['result']['locked_since']
-        expected = {
-            'repo': self.REPO,
-            'locked': True,
-            'locked_since': time_,
-            'locked_by': TEST_USER_ADMIN_LOGIN,
-            'lock_state_changed': False,
-            'msg': ('Repo `%s` locked by `%s` on `%s`.'
-                    % (self.REPO, TEST_USER_ADMIN_LOGIN,
-                       json.dumps(time_to_datetime(time_))))
-        }
-        self._compare_ok(id_, expected, given=response.body)
+        try:
+            id_, params = _build_data(self.apikey, 'lock',
+                                      repoid=self.REPO)
+            response = api_call(self, params)
+            time_ = response.json['result']['locked_since']
+            expected = {
+                'repo': self.REPO,
+                'locked': True,
+                'locked_since': time_,
+                'locked_by': TEST_USER_ADMIN_LOGIN,
+                'lock_state_changed': False,
+                'msg': ('Repo `%s` locked by `%s` on `%s`.'
+                        % (self.REPO, TEST_USER_ADMIN_LOGIN,
+                           json.dumps(time_to_datetime(time_))))
+            }
+            self._compare_ok(id_, expected, given=response.body)
+        finally:
+            # cleanup
+            Repository.unlock(RepoModel().get_by_repo_name(self.REPO))
 
     def test_api_lock_repo_lock_optional_not_locked(self):
         repo_name = u'api_not_locked'