tests: Make test work with either http or pyro4 protocol.

rhodecode/tests/lib/middleware/test_vcs_unavailable.py

@@ -1,50 +1,60 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 mock
 import pytest
-import rhodecode.lib.vcs.client as client
-from rhodecode.lib.middleware.error_handling import (
-    PylonsErrorHandlingMiddleware)
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 def test_vcs_available_returns_summary_page(app, backend):
     url = '/{repo_name}'.format(repo_name=backend.repo.repo_name)
     response = app.get(url)
     assert response.status_code == 200
     assert 'Summary' in response.body
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
-def test_vcs_unavailable_returns_vcs_error_page(app, backend):
+def test_vcs_unavailable_returns_vcs_error_page(app, backend, app_settings):
+    import rhodecode
+    from rhodecode.lib.vcs.exceptions import VCSCommunicationError
+
+    # Depending on the used VCSServer protocol we have to patch a different
+    # RemoteRepo class to raise an exception. For the test it doesn't matter
+    # if http or pyro4 is used, it just requires the exception to be raised.
+    vcs_protocol = app_settings['vcs.server.protocol']
+    if vcs_protocol == 'http':
+        from rhodecode.lib.vcs.client_http import RemoteRepo
+    elif vcs_protocol == 'pyro4':
+        from rhodecode.lib.vcs.client import RemoteRepo
+    else:
+        pytest.fail('Unknown VCS server protocol: "{}"'.format(vcs_protocol))
+
     url = '/{repo_name}'.format(repo_name=backend.repo.repo_name)
 
-    # Path the get proxy method to raise an exception instead of making a RPC
-    # call to the vcsserver.
-    with mock.patch.object(client, '_get_proxy_method') as p:
-        p.side_effect = client.exceptions.PyroVCSCommunicationError()
+    # Patch remote repo to raise an exception instead of making a RPC.
+    with mock.patch.object(RemoteRepo, '__getattr__') as remote_mock:
+        remote_mock.side_effect = VCSCommunicationError()
         # Patch pylons error handling middleware to not re-raise exceptions.
         with mock.patch.object(PylonsErrorHandlingMiddleware, 'reraise') as r:
             r.return_value = False
             response = app.get(url, expect_errors=True)
 
     assert response.status_code == 502
     assert 'Could not connect to VCS Server' in response.body