# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1559863527 -7200
# Node ID 460cfae112034951cc5d86ca8c92f8ad6c1e9874
# Parent  1f831a8a590cd42267b16463541d6f829f3c40de
tests: fix merge error in test_vcs_operations mixins for Mercurial and Git - don't hardcode webserver repo_url_param

diff -r 1f831a8a590c -r 460cfae11203 kallithea/tests/other/test_vcs_operations.py
--- a/kallithea/tests/other/test_vcs_operations.py	Thu Jun 06 23:47:43 2019 +0200
+++ b/kallithea/tests/other/test_vcs_operations.py	Fri Jun 07 01:25:27 2019 +0200
@@ -52,25 +52,22 @@
 # Parameterize different kinds of VCS testing - both the kind of VCS and the
 # access method (HTTP/SSH)
 
+# Mixin for using HTTP URLs
 class HttpVcsTest(object):
     @staticmethod
     def repo_url_param(webserver, repo_name, **kwargs):
         return webserver.repo_url(repo_name, **kwargs)
 
+# Mixins for using Mercurial and Git
 class HgVcsTest(object):
     repo_type = 'hg'
     repo_name = HG_REPO
-    @staticmethod
-    def repo_url_param(webserver, repo_name, **kwargs):
-        return webserver.repo_url(repo_name, **kwargs)
 
 class GitVcsTest(object):
     repo_type = 'git'
     repo_name = GIT_REPO
-    @staticmethod
-    def repo_url_param(webserver, repo_name, **kwargs):
-        return webserver.repo_url(repo_name, **kwargs)
 
+# Combine mixins to give the combinations we want to parameterize tests with
 class HgHttpVcsTest(HgVcsTest, HttpVcsTest):
     pass