# HG changeset patch # User Marcin Kuzminski # Date 2018-02-19 12:40:07 # Node ID 44eba3e82a37a3edd4a2751cba5fa24c2bb85c77 # Parent 37989561b80cad9a85afb25683cc60e923c0cf90 svn: fixed tests for svn backend. diff --git a/rhodecode/apps/ssh_support/lib/backends/svn.py b/rhodecode/apps/ssh_support/lib/backends/svn.py --- a/rhodecode/apps/ssh_support/lib/backends/svn.py +++ b/rhodecode/apps/ssh_support/lib/backends/svn.py @@ -117,6 +117,7 @@ class SubversionTunnelWrapper(object): message=self._svn_string(message))) self.remove_configs() self.process.kill() + return 1 def interrupt(self, signum, frame): self.fail("Exited by timeout") @@ -171,7 +172,7 @@ class SubversionTunnelWrapper(object): first_response = self.get_first_client_response() if not first_response: - self.fail("Repository name cannot be extracted") + return self.fail("Repository name cannot be extracted") url_parts = urlparse.urlparse(first_response['url']) self.server.repo_name = url_parts.path.strip('/') diff --git a/rhodecode/apps/ssh_support/tests/test_server_svn.py b/rhodecode/apps/ssh_support/tests/test_server_svn.py --- a/rhodecode/apps/ssh_support/tests/test_server_svn.py +++ b/rhodecode/apps/ssh_support/tests/test_server_svn.py @@ -103,7 +103,7 @@ class TestSubversionServer(object): return_value=0): with mock.patch.object( SubversionTunnelWrapper, 'command', - return_value='date'): + return_value=['date']): exit_code = server.run() # SVN has this differently configured, and we get in our mock env @@ -115,7 +115,7 @@ class TestSubversionServer(object): from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper with mock.patch.object( SubversionTunnelWrapper, 'command', - return_value='date'): + return_value=['date']): with mock.patch.object( SubversionTunnelWrapper, 'get_first_client_response', return_value=None):