# HG changeset patch # User RhodeCode Admin # Date 2022-08-10 15:37:23 # Node ID 1fc3584c462a881ea1df338552e87ef24401d791 # Parent 8b44d37f0e391122982a948190988cf1fb5ecfd1 caches: small naming refactor to fix tests. diff --git a/vcsserver/git.py b/vcsserver/git.py --- a/vcsserver/git.py +++ b/vcsserver/git.py @@ -185,7 +185,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def assert_correct_path(self, wire): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _assert_correct_path(_context_uid, _repo_id): try: @@ -218,7 +218,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def blob_raw_length(self, wire, sha): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _blob_raw_length(_repo_id, _sha): @@ -250,7 +250,7 @@ class GitRemote(RemoteBase): def is_large_file(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _is_large_file(_repo_id, _sha): repo_init = self._factory.repo_libgit2(wire) @@ -267,7 +267,7 @@ class GitRemote(RemoteBase): def is_binary(self, wire, tree_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _is_binary(_repo_id, _tree_id): repo_init = self._factory.repo_libgit2(wire) @@ -310,7 +310,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def bulk_request(self, wire, rev, pre_load): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _bulk_request(_repo_id, _rev, _pre_load): result = {} @@ -414,7 +414,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def branch(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _branch(_context_uid, _repo_id, _commit_id): regex = re.compile('^refs/heads') @@ -430,7 +430,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def commit_branches(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _commit_branches(_context_uid, _repo_id, _commit_id): repo_init = self._factory.repo_libgit2(wire) @@ -697,7 +697,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def get_object(self, wire, sha, maybe_unreachable=False): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_object(_context_uid, _repo_id, _sha): repo_init = self._factory.repo_libgit2(wire) @@ -756,7 +756,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def get_refs(self, wire): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_refs(_context_uid, _repo_id): @@ -771,7 +771,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def get_branch_pointers(self, wire): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_branch_pointers(_context_uid, _repo_id): @@ -786,7 +786,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def head(self, wire, show_exc=True): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _head(_context_uid, _repo_id, _show_exc): repo_init = self._factory.repo_libgit2(wire) @@ -812,7 +812,7 @@ class GitRemote(RemoteBase): def revision(self, wire, rev): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _revision(_context_uid, _repo_id, _rev): repo_init = self._factory.repo_libgit2(wire) @@ -831,7 +831,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def date(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _date(_repo_id, _commit_id): repo_init = self._factory.repo_libgit2(wire) @@ -851,7 +851,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def author(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _author(_repo_id, _commit_id): repo_init = self._factory.repo_libgit2(wire) @@ -876,7 +876,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def message(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _message(_repo_id, _commit_id): repo_init = self._factory.repo_libgit2(wire) @@ -888,7 +888,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def parents(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _parents(_repo_id, _commit_id): repo_init = self._factory.repo_libgit2(wire) @@ -905,7 +905,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def children(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _children(_repo_id, _commit_id): output, __ = self.run_git_command( @@ -965,7 +965,7 @@ class GitRemote(RemoteBase): def tree_and_type_for_path(self, wire, commit_id, path): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _tree_and_type_for_path(_context_uid, _repo_id, _commit_id, _path): repo_init = self._factory.repo_libgit2(wire) @@ -983,7 +983,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def tree_items(self, wire, tree_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _tree_items(_repo_id, _tree_id): @@ -1085,7 +1085,7 @@ class GitRemote(RemoteBase): @reraise_safe_exceptions def node_history(self, wire, commit_id, path, limit): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _node_history(_context_uid, _repo_id, _commit_id, _path, _limit): # optimize for n==1, rev-list is much faster for that use-case @@ -1128,7 +1128,7 @@ class GitRemote(RemoteBase): def get_all_commit_ids(self, wire): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_all_commit_ids(_context_uid, _repo_id): diff --git a/vcsserver/hg.py b/vcsserver/hg.py --- a/vcsserver/hg.py +++ b/vcsserver/hg.py @@ -209,7 +209,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def bookmarks(self, wire): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _bookmarks(_context_uid, _repo_id): repo = self._factory.repo(wire) @@ -220,7 +220,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def branches(self, wire, normal, closed): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _branches(_context_uid, _repo_id, _normal, _closed): repo = self._factory.repo(wire) @@ -239,7 +239,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def bulk_request(self, wire, commit_id, pre_load): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _bulk_request(_repo_id, _commit_id, _pre_load): result = {} @@ -257,7 +257,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_branch(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_branch(_repo_id, _commit_id): repo = self._factory.repo(wire) @@ -268,7 +268,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_date(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_date(_repo_id, _commit_id): repo = self._factory.repo(wire) @@ -285,7 +285,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_files(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_files(_repo_id, _commit_id): repo = self._factory.repo(wire) @@ -303,7 +303,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_parents(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_parents(_repo_id, _commit_id): repo = self._factory.repo(wire) @@ -316,7 +316,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_children(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_children(_repo_id, _commit_id): repo = self._factory.repo(wire) @@ -329,7 +329,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_phase(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_phase(_context_uid, _repo_id, _commit_id): repo = self._factory.repo(wire) @@ -341,7 +341,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_obsolete(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_obsolete(_context_uid, _repo_id, _commit_id): repo = self._factory.repo(wire) @@ -352,7 +352,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def ctx_hidden(self, wire, commit_id): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _ctx_hidden(_context_uid, _repo_id, _commit_id): repo = self._factory.repo(wire) @@ -466,7 +466,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def node_history(self, wire, revision, path, limit): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _node_history(_context_uid, _repo_id, _revision, _path, _limit): repo = self._factory.repo(wire) @@ -497,7 +497,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def node_history_untill(self, wire, revision, path, limit): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _node_history_until(_context_uid, _repo_id): repo = self._factory.repo(wire) @@ -536,7 +536,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def fctx_flags(self, wire, commit_id, path): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _fctx_flags(_repo_id, _commit_id, _path): repo = self._factory.repo(wire) @@ -549,7 +549,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def fctx_size(self, wire, commit_id, path): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _fctx_size(_repo_id, _revision, _path): repo = self._factory.repo(wire) @@ -561,7 +561,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def get_all_commit_ids(self, wire, name): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_all_commit_ids(_context_uid, _repo_id, _name): repo = self._factory.repo(wire) @@ -578,7 +578,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def is_large_file(self, wire, commit_id, path): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _is_large_file(_context_uid, _repo_id, _commit_id, _path): return largefiles.lfutil.isstandin(path) @@ -589,7 +589,7 @@ class HgRemote(RemoteBase): def is_binary(self, wire, revision, path): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _is_binary(_repo_id, _sha, _path): repo = self._factory.repo(wire) @@ -628,7 +628,7 @@ class HgRemote(RemoteBase): def lookup(self, wire, revision, both): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _lookup(_context_uid, _repo_id, _revision, _both): @@ -687,7 +687,7 @@ class HgRemote(RemoteBase): def rev_range(self, wire, commit_filter): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _rev_range(_context_uid, _repo_id, _filter): repo = self._factory.repo(wire) @@ -763,7 +763,7 @@ class HgRemote(RemoteBase): @reraise_safe_exceptions def tags(self, wire): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _tags(_context_uid, _repo_id): repo = self._factory.repo(wire) diff --git a/vcsserver/svn.py b/vcsserver/svn.py --- a/vcsserver/svn.py +++ b/vcsserver/svn.py @@ -201,7 +201,7 @@ class SvnRemote(RemoteBase): def revision_properties(self, wire, revision): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _revision_properties(_repo_id, _revision): repo = self._factory.repo(wire) @@ -256,7 +256,7 @@ class SvnRemote(RemoteBase): @reraise_safe_exceptions def node_history(self, wire, path, revision, limit): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _assert_correct_path(_context_uid, _repo_id, _path, _revision, _limit): cross_copies = False @@ -278,7 +278,7 @@ class SvnRemote(RemoteBase): def node_properties(self, wire, path, revision): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _node_properties(_repo_id, _path, _revision): repo = self._factory.repo(wire) @@ -317,7 +317,7 @@ class SvnRemote(RemoteBase): def get_node_type(self, wire, path, revision=None): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_node_type(_repo_id, _path, _revision): repo = self._factory.repo(wire) @@ -332,7 +332,7 @@ class SvnRemote(RemoteBase): def get_nodes(self, wire, path, revision=None): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_nodes(_repo_id, _path, _revision): repo = self._factory.repo(wire) @@ -360,7 +360,7 @@ class SvnRemote(RemoteBase): def get_file_size(self, wire, path, revision=None): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _get_file_size(_repo_id, _path, _revision): repo = self._factory.repo(wire) @@ -476,7 +476,7 @@ class SvnRemote(RemoteBase): def is_binary(self, wire, rev, path): cache_on, context_uid, repo_id = self._cache_on(wire) - region = self.region(wire) + region = self._region(wire) @region.conditional_cache_on_arguments(condition=cache_on) def _is_binary(_repo_id, _rev, _path): raw_bytes = self.get_file_content(wire, path, rev) diff --git a/vcsserver/tests/test_git.py b/vcsserver/tests/test_git.py --- a/vcsserver/tests/test_git.py +++ b/vcsserver/tests/test_git.py @@ -113,7 +113,7 @@ class TestReraiseSafeExceptions(object): methods = inspect.getmembers(git_remote, predicate=inspect.ismethod) for method_name, method in methods: - if not method_name.startswith('_'): + if not method_name.startswith('_') and method_name not in ['vcsserver_invalidate_cache']: assert method.im_func.__code__ == decorator.__code__ @pytest.mark.parametrize('side_effect, expected_type', [ diff --git a/vcsserver/tests/test_hg.py b/vcsserver/tests/test_hg.py --- a/vcsserver/tests/test_hg.py +++ b/vcsserver/tests/test_hg.py @@ -50,7 +50,7 @@ class TestReraiseSafeExceptions(object): methods = inspect.getmembers(hg_remote, predicate=inspect.ismethod) decorator = hg.reraise_safe_exceptions(None) for method_name, method in methods: - if not method_name.startswith('_'): + if not method_name.startswith('_') and method_name not in ['vcsserver_invalidate_cache']: assert method.im_func.__code__ == decorator.__code__ @pytest.mark.parametrize('side_effect, expected_type', [ diff --git a/vcsserver/vcs_base.py b/vcsserver/vcs_base.py --- a/vcsserver/vcs_base.py +++ b/vcsserver/vcs_base.py @@ -20,7 +20,7 @@ from vcsserver.lib import rc_cache class RemoteBase(object): EMPTY_COMMIT = '0' * 40 - def region(self, wire): + def _region(self, wire): repo_id = wire.get('repo_id', '') cache_namespace_uid = 'cache_repo.{}'.format(repo_id) return rc_cache.get_or_create_region('repo_object', cache_namespace_uid)