Show More
@@ -19,6 +19,7 b'' | |||
|
19 | 19 | # and proprietary license terms, please see https://rhodecode.com/licenses/ |
|
20 | 20 | |
|
21 | 21 | |
|
22 | import codecs | |
|
22 | 23 | import mock |
|
23 | 24 | import re |
|
24 | 25 | import shutil |
@@ -30,6 +31,7 b' from rhodecode.svn_support import config' | |||
|
30 | 31 | |
|
31 | 32 | |
|
32 | 33 | class TestModDavSvnConfig(object): |
|
34 | ||
|
33 | 35 | @classmethod |
|
34 | 36 | def setup_class(cls): |
|
35 | 37 | # Make mako renderer available in tests. |
@@ -39,8 +41,9 b' class TestModDavSvnConfig(object):' | |||
|
39 | 41 | # Temporary directory holding the generated config files. |
|
40 | 42 | cls.tempdir = tempfile.mkdtemp(suffix='pytest-mod-dav-svn') |
|
41 | 43 | |
|
42 | cls.location_root = '/location/root' | |
|
43 |
cls.parent_path_root = '/parent/path/ |
|
|
44 | cls.location_root = u'/location/root/ç¡Àâ' | |
|
45 | cls.parent_path_root = u'/parent/path/ç¡Àâ' | |
|
46 | cls._dummy_realm = u'Dummy Realm (Àâüç¡)' | |
|
44 | 47 | |
|
45 | 48 | @classmethod |
|
46 | 49 | def teardown_class(cls): |
@@ -61,7 +64,7 b' class TestModDavSvnConfig(object):' | |||
|
61 | 64 | def get_repo_groups(cls, count=1): |
|
62 | 65 | repo_groups = [] |
|
63 | 66 | for num in range(0, count): |
|
64 |
full_path = '/path/to/Rep |
|
|
67 | full_path = u'/path/to/RepâGrâúp-°¡ {}'.format(num) | |
|
65 | 68 | repo_group_mock = mock.MagicMock() |
|
66 | 69 | repo_group_mock.full_path = full_path |
|
67 | 70 | repo_group_mock.full_path_splitted = full_path.split('/') |
@@ -69,11 +72,12 b' class TestModDavSvnConfig(object):' | |||
|
69 | 72 | return repo_groups |
|
70 | 73 | |
|
71 | 74 | def assert_root_location_directive(self, config): |
|
72 |
pattern = '<Location {location}>'.format( |
|
|
75 | pattern = u'<Location "{location}">'.format( | |
|
76 | location=self.location_root) | |
|
73 | 77 | assert len(re.findall(pattern, config)) == 1 |
|
74 | 78 | |
|
75 | 79 | def assert_group_location_directive(self, config, group_path): |
|
76 | pattern = '<Location {location}{group_path}>'.format( | |
|
80 | pattern = u'<Location "{location}{group_path}">'.format( | |
|
77 | 81 | location=self.location_root, group_path=group_path) |
|
78 | 82 | assert len(re.findall(pattern, config)) == 1 |
|
79 | 83 | |
@@ -81,7 +85,7 b' class TestModDavSvnConfig(object):' | |||
|
81 | 85 | @mock.patch('rhodecode.svn_support.utils.RepoGroup') |
|
82 | 86 | def test_generate_mod_dav_svn_config(self, RepoGroupMock, GetRealmMock): |
|
83 | 87 | # Setup mock objects. |
|
84 |
GetRealmMock.return_value = |
|
|
88 | GetRealmMock.return_value = self._dummy_realm | |
|
85 | 89 | num_groups = 3 |
|
86 | 90 | RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups( |
|
87 | 91 | count=num_groups) |
@@ -92,8 +96,9 b' class TestModDavSvnConfig(object):' | |||
|
92 | 96 | settings=settings, parent_path_root=self.parent_path_root) |
|
93 | 97 | |
|
94 | 98 | # Read generated file. |
|
95 |
|
|
|
96 | content = file_.read() | |
|
99 | path = settings[config_keys.config_file_path] | |
|
100 | with codecs.open(path, 'r', encoding='utf-8') as f: | |
|
101 | content = f.read() | |
|
97 | 102 | |
|
98 | 103 | # Assert that one location directive exists for each repository group. |
|
99 | 104 | for group in self.get_repo_groups(count=num_groups): |
@@ -106,7 +111,7 b' class TestModDavSvnConfig(object):' | |||
|
106 | 111 | @mock.patch('rhodecode.svn_support.utils.RepoGroup') |
|
107 | 112 | def test_list_parent_path_on(self, RepoGroupMock, GetRealmMock): |
|
108 | 113 | # Setup mock objects. |
|
109 |
GetRealmMock.return_value = |
|
|
114 | GetRealmMock.return_value = self._dummy_realm | |
|
110 | 115 | RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups() |
|
111 | 116 | |
|
112 | 117 | # Execute the method under test. |
@@ -116,8 +121,9 b' class TestModDavSvnConfig(object):' | |||
|
116 | 121 | settings=settings, parent_path_root=self.parent_path_root) |
|
117 | 122 | |
|
118 | 123 | # Read generated file. |
|
119 |
|
|
|
120 | content = file_.read() | |
|
124 | path = settings[config_keys.config_file_path] | |
|
125 | with codecs.open(path, 'r', encoding='utf-8') as f: | |
|
126 | content = f.read() | |
|
121 | 127 | |
|
122 | 128 | # Make assertions. |
|
123 | 129 | assert not re.search('SVNListParentPath\s+Off', content) |
@@ -127,7 +133,7 b' class TestModDavSvnConfig(object):' | |||
|
127 | 133 | @mock.patch('rhodecode.svn_support.utils.RepoGroup') |
|
128 | 134 | def test_list_parent_path_off(self, RepoGroupMock, GetRealmMock): |
|
129 | 135 | # Setup mock objects. |
|
130 |
GetRealmMock.return_value = |
|
|
136 | GetRealmMock.return_value = self._dummy_realm | |
|
131 | 137 | RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups() |
|
132 | 138 | |
|
133 | 139 | # Execute the method under test. |
General Comments 0
You need to be logged in to leave comments.
Login now