Show More
@@ -57,7 +57,6 b' class TestChangesetController(object):' | |||
|
57 | 57 | revision=self.commit_id[backend.alias])) |
|
58 | 58 | assert response.body == self.diffs[backend.alias] |
|
59 | 59 | |
|
60 | @pytest.mark.xfail_backends("svn", reason="Depends on consistent diffs") | |
|
61 | 60 | def test_single_commit_page_different_ops(self, backend): |
|
62 | 61 | commit_id = { |
|
63 | 62 | 'hg': '603d6c72c46d953420c89d36372f08d9f305f5dd', |
@@ -75,12 +74,16 b' class TestChangesetController(object):' | |||
|
75 | 74 | # files op files |
|
76 | 75 | response.mustcontain('File no longer present at commit: %s' % |
|
77 | 76 | _shorten_commit_id(commit_id)) |
|
78 | response.mustcontain('new file 100644') | |
|
77 | ||
|
78 | # svn uses a different filename | |
|
79 | if backend.alias == 'svn': | |
|
80 | response.mustcontain('new file 10644') | |
|
81 | else: | |
|
82 | response.mustcontain('new file 100644') | |
|
79 | 83 | response.mustcontain('Changed theme to ADC theme') # commit msg |
|
80 | 84 | |
|
81 | 85 | self._check_diff_menus(response, right_menu=True) |
|
82 | 86 | |
|
83 | @pytest.mark.xfail_backends("svn", reason="Depends on consistent diffs") | |
|
84 | 87 | def test_commit_range_page_different_ops(self, backend): |
|
85 | 88 | commit_id_range = { |
|
86 | 89 | 'hg': ( |
@@ -101,18 +104,23 b' class TestChangesetController(object):' | |||
|
101 | 104 | |
|
102 | 105 | response.mustcontain(_shorten_commit_id(commit_ids[0])) |
|
103 | 106 | response.mustcontain(_shorten_commit_id(commit_ids[1])) |
|
104 | response.mustcontain('33 files changed: 1165 inserted, 308 deleted') | |
|
107 | ||
|
108 | # svn is special | |
|
109 | if backend.alias == 'svn': | |
|
110 | response.mustcontain('new file 10644') | |
|
111 | response.mustcontain('34 files changed: 1184 inserted, 311 deleted') | |
|
112 | else: | |
|
113 | response.mustcontain('new file 100644') | |
|
114 | response.mustcontain('33 files changed: 1165 inserted, 308 deleted') | |
|
105 | 115 | |
|
106 | 116 | # files op files |
|
107 | 117 | response.mustcontain('File no longer present at commit: %s' % |
|
108 | 118 | _shorten_commit_id(commit_ids[1])) |
|
109 | response.mustcontain('new file 100644') | |
|
110 | 119 | response.mustcontain('Added docstrings to vcs.cli') # commit msg |
|
111 | 120 | response.mustcontain('Changed theme to ADC theme') # commit msg |
|
112 | 121 | |
|
113 | 122 | self._check_diff_menus(response) |
|
114 | 123 | |
|
115 | @pytest.mark.xfail_backends("svn", reason="Depends on consistent diffs") | |
|
116 | 124 | def test_combined_compare_commit_page_different_ops(self, backend): |
|
117 | 125 | commit_id_range = { |
|
118 | 126 | 'hg': ( |
@@ -134,12 +142,19 b' class TestChangesetController(object):' | |||
|
134 | 142 | |
|
135 | 143 | response.mustcontain(_shorten_commit_id(commit_ids[0])) |
|
136 | 144 | response.mustcontain(_shorten_commit_id(commit_ids[1])) |
|
137 | response.mustcontain('32 files changed: 1165 inserted, 308 deleted') | |
|
138 | 145 | |
|
139 | 146 | # files op files |
|
140 | 147 | response.mustcontain('File no longer present at commit: %s' % |
|
141 | 148 | _shorten_commit_id(commit_ids[1])) |
|
142 | response.mustcontain('new file 100644') | |
|
149 | ||
|
150 | # svn is special | |
|
151 | if backend.alias == 'svn': | |
|
152 | response.mustcontain('new file 10644') | |
|
153 | response.mustcontain('32 files changed: 1179 inserted, 310 deleted') | |
|
154 | else: | |
|
155 | response.mustcontain('new file 100644') | |
|
156 | response.mustcontain('32 files changed: 1165 inserted, 308 deleted') | |
|
157 | ||
|
143 | 158 | response.mustcontain('Added docstrings to vcs.cli') # commit msg |
|
144 | 159 | response.mustcontain('Changed theme to ADC theme') # commit msg |
|
145 | 160 |
General Comments 0
You need to be logged in to leave comments.
Login now