Mercurial > kallithea

changeset 1984:ed3b20284830 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed tests after latest changes to history list
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 07 Feb 2012 07:22:47 +0200
parents 8fa8d0d034e6
children 40f04021fa61
files rhodecode/tests/functional/test_files.py
diffstat 1 files changed, 113 insertions(+), 118 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/tests/functional/test_files.py	Tue Feb 07 06:38:10 2012 +0200
+++ b/rhodecode/tests/functional/test_files.py	Tue Feb 07 07:22:47 2012 +0200
@@ -6,6 +6,7 @@
     '.zip': ('application/zip', 'zip', ''),
 }
 
+
 class TestFilesController(TestController):
 
     def test_index(self):
@@ -15,32 +16,29 @@
                                     revision='tip',
                                     f_path='/'))
         # Test response...
-        assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/docs">docs</a>' in response.body, 'missing dir'
-        assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/tests">tests</a>' in response.body, 'missing dir'
-        assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/vcs">vcs</a>' in response.body, 'missing dir'
-        assert '<a class="browser-file ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/.hgignore">.hgignore</a>' in response.body, 'missing file'
-        assert '<a class="browser-file ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/MANIFEST.in">MANIFEST.in</a>' in response.body, 'missing file'
-
+        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/docs">docs</a>')
+        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/tests">tests</a>')
+        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/vcs">vcs</a>')
+        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/.hgignore">.hgignore</a>')
+        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/MANIFEST.in">MANIFEST.in</a>')
 
     def test_index_revision(self):
         self.log_user()
 
-        response = self.app.get(url(controller='files', action='index',
-                                    repo_name=HG_REPO,
-                                    revision='7ba66bec8d6dbba14a2155be32408c435c5f4492',
-                                    f_path='/'))
-
-
+        response = self.app.get(
+            url(controller='files', action='index',
+                repo_name=HG_REPO,
+                revision='7ba66bec8d6dbba14a2155be32408c435c5f4492',
+                f_path='/')
+        )
 
         #Test response...
 
-        assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs">docs</a>' in response.body, 'missing dir'
-        assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests">tests</a>' in response.body, 'missing dir'
-        assert '<a class="browser-file ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst">README.rst</a>' in response.body, 'missing file'
-        assert '1.1 KiB' in response.body, 'missing size of setup.py'
-        assert 'text/x-python' in response.body, 'missing mimetype of setup.py'
-
-
+        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs">docs</a>')
+        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests">tests</a>')
+        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst">README.rst</a>')
+        response.mustcontain('1.1 KiB')
+        response.mustcontain('text/x-python')
 
     def test_index_different_branch(self):
         self.log_user()
@@ -50,11 +48,7 @@
                                     revision='97e8b885c04894463c51898e14387d80c30ed1ee',
                                     f_path='/'))
 
-
-
-        assert """<span style="text-transform: uppercase;"><a href="#">branch: git</a></span>""" in response.body, 'missing or wrong branch info'
-
-
+        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: git</a></span>""")
 
     def test_index_paging(self):
         self.log_user()
@@ -70,7 +64,7 @@
                                     revision=r[1],
                                     f_path='/'))
 
-            assert """@ r%s:%s""" % (r[0], r[1][:12]) in response.body, 'missing info about current revision'
+            response.mustcontain("""@ r%s:%s""" % (r[0], r[1][:12]))
 
     def test_file_source(self):
         self.log_user()
@@ -80,40 +74,40 @@
                                     f_path='vcs/nodes.py'))
 
         #test or history
-        assert """<optgroup label="Changesets">
-<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776</option>
-<option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35</option>
-<option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c</option>
-<option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329</option>
-<option value="6249fd0fb2cfb1411e764129f598e2cf0de79a6f">r113:6249fd0fb2cf</option>
-<option value="75feb4c33e81186c87eac740cee2447330288412">r109:75feb4c33e81</option>
-<option value="9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d">r108:9a4dc232ecdc</option>
-<option value="595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d">r107:595cce4efa21</option>
-<option value="4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da">r104:4a8bd421fbc2</option>
-<option value="57be63fc8f85e65a0106a53187f7316f8c487ffa">r102:57be63fc8f85</option>
-<option value="5530bd87f7e2e124a64d07cb2654c997682128be">r101:5530bd87f7e2</option>
-<option value="e516008b1c93f142263dc4b7961787cbad654ce1">r99:e516008b1c93</option>
-<option value="41f43fc74b8b285984554532eb105ac3be5c434f">r93:41f43fc74b8b</option>
-<option value="cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e">r92:cc66b61b8455</option>
-<option value="73ab5b616b3271b0518682fb4988ce421de8099f">r91:73ab5b616b32</option>
-<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0</option>
-<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081</option>
-<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad</option>
-<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7</option>
-<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059</option>
-<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb</option>
-<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1</option>
-<option value="97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f">r58:97d32df05c71</option>
-<option value="08eaf14517718dccea4b67755a93368341aca919">r57:08eaf1451771</option>
-<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526</option>
-<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4</option>
-<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b</option>
-<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c</option>
-<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1</option>
-<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5</option>
-<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283</option>
-<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6</option>
-<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3</option>
+        response.mustcontain("""<optgroup label="Changesets">
+<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776 (default)</option>
+<option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35 (default)</option>
+<option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c (default)</option>
+<option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329 (default)</option>
+<option value="6249fd0fb2cfb1411e764129f598e2cf0de79a6f">r113:6249fd0fb2cf (git)</option>
+<option value="75feb4c33e81186c87eac740cee2447330288412">r109:75feb4c33e81 (default)</option>
+<option value="9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d">r108:9a4dc232ecdc (default)</option>
+<option value="595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d">r107:595cce4efa21 (default)</option>
+<option value="4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da">r104:4a8bd421fbc2 (default)</option>
+<option value="57be63fc8f85e65a0106a53187f7316f8c487ffa">r102:57be63fc8f85 (default)</option>
+<option value="5530bd87f7e2e124a64d07cb2654c997682128be">r101:5530bd87f7e2 (git)</option>
+<option value="e516008b1c93f142263dc4b7961787cbad654ce1">r99:e516008b1c93 (default)</option>
+<option value="41f43fc74b8b285984554532eb105ac3be5c434f">r93:41f43fc74b8b (default)</option>
+<option value="cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e">r92:cc66b61b8455 (default)</option>
+<option value="73ab5b616b3271b0518682fb4988ce421de8099f">r91:73ab5b616b32 (default)</option>
+<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0 (default)</option>
+<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081 (default)</option>
+<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad (default)</option>
+<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7 (default)</option>
+<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059 (web)</option>
+<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb (web)</option>
+<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1 (web)</option>
+<option value="97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f">r58:97d32df05c71 (web)</option>
+<option value="08eaf14517718dccea4b67755a93368341aca919">r57:08eaf1451771 (web)</option>
+<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526 (web)</option>
+<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4 (web)</option>
+<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b (web)</option>
+<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c (web)</option>
+<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1 (default)</option>
+<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5 (default)</option>
+<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283 (default)</option>
+<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6 (default)</option>
+<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3 (default)</option>
 </optgroup>
 <optgroup label="Branches">
 <option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>
@@ -126,16 +120,15 @@
 <option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>
 <option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>
 <option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>
-</optgroup>""" in response.body
+</optgroup>""")
 
-
-        assert """<div class="commit">Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now.
+        response.mustcontain("""<div class="commit">Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now.
 In addition some other __str__ are unicode as well
 Added test for unicode
 Improved test to clone into uniq repository.
-removed extra unicode conversion in diff.</div>""" in response.body
+removed extra unicode conversion in diff.</div>""")
 
-        assert """<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""" in response.body, 'missing or wrong branch info'
+        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
 
     def test_file_annotation(self):
         self.log_user()
@@ -144,41 +137,41 @@
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py'))
 
-        print response.body
-        assert """<optgroup label="Changesets">
-<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776</option>
-<option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35</option>
-<option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c</option>
-<option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329</option>
-<option value="6249fd0fb2cfb1411e764129f598e2cf0de79a6f">r113:6249fd0fb2cf</option>
-<option value="75feb4c33e81186c87eac740cee2447330288412">r109:75feb4c33e81</option>
-<option value="9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d">r108:9a4dc232ecdc</option>
-<option value="595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d">r107:595cce4efa21</option>
-<option value="4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da">r104:4a8bd421fbc2</option>
-<option value="57be63fc8f85e65a0106a53187f7316f8c487ffa">r102:57be63fc8f85</option>
-<option value="5530bd87f7e2e124a64d07cb2654c997682128be">r101:5530bd87f7e2</option>
-<option value="e516008b1c93f142263dc4b7961787cbad654ce1">r99:e516008b1c93</option>
-<option value="41f43fc74b8b285984554532eb105ac3be5c434f">r93:41f43fc74b8b</option>
-<option value="cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e">r92:cc66b61b8455</option>
-<option value="73ab5b616b3271b0518682fb4988ce421de8099f">r91:73ab5b616b32</option>
-<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0</option>
-<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081</option>
-<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad</option>
-<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7</option>
-<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059</option>
-<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb</option>
-<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1</option>
-<option value="97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f">r58:97d32df05c71</option>
-<option value="08eaf14517718dccea4b67755a93368341aca919">r57:08eaf1451771</option>
-<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526</option>
-<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4</option>
-<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b</option>
-<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c</option>
-<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1</option>
-<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5</option>
-<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283</option>
-<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6</option>
-<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3</option>
+
+        response.mustcontain("""<optgroup label="Changesets">
+<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776 (default)</option>
+<option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35 (default)</option>
+<option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c (default)</option>
+<option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329 (default)</option>
+<option value="6249fd0fb2cfb1411e764129f598e2cf0de79a6f">r113:6249fd0fb2cf (git)</option>
+<option value="75feb4c33e81186c87eac740cee2447330288412">r109:75feb4c33e81 (default)</option>
+<option value="9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d">r108:9a4dc232ecdc (default)</option>
+<option value="595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d">r107:595cce4efa21 (default)</option>
+<option value="4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da">r104:4a8bd421fbc2 (default)</option>
+<option value="57be63fc8f85e65a0106a53187f7316f8c487ffa">r102:57be63fc8f85 (default)</option>
+<option value="5530bd87f7e2e124a64d07cb2654c997682128be">r101:5530bd87f7e2 (git)</option>
+<option value="e516008b1c93f142263dc4b7961787cbad654ce1">r99:e516008b1c93 (default)</option>
+<option value="41f43fc74b8b285984554532eb105ac3be5c434f">r93:41f43fc74b8b (default)</option>
+<option value="cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e">r92:cc66b61b8455 (default)</option>
+<option value="73ab5b616b3271b0518682fb4988ce421de8099f">r91:73ab5b616b32 (default)</option>
+<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0 (default)</option>
+<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081 (default)</option>
+<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad (default)</option>
+<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7 (default)</option>
+<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059 (web)</option>
+<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb (web)</option>
+<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1 (web)</option>
+<option value="97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f">r58:97d32df05c71 (web)</option>
+<option value="08eaf14517718dccea4b67755a93368341aca919">r57:08eaf1451771 (web)</option>
+<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526 (web)</option>
+<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4 (web)</option>
+<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b (web)</option>
+<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c (web)</option>
+<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1 (default)</option>
+<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5 (default)</option>
+<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283 (default)</option>
+<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6 (default)</option>
+<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3 (default)</option>
 </optgroup>
 <optgroup label="Branches">
 <option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>
@@ -191,11 +184,10 @@
 <option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>
 <option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>
 <option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>
-</optgroup>""" in response.body, 'missing or wrong history in annotation'
+</optgroup>
+""")
 
-        assert """<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""" in response.body, 'missing or wrong branch info'
-
-
+        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
 
     def test_archival(self):
         self.log_user()
@@ -260,10 +252,11 @@
                                     revision=rev,
                                     f_path=f_path))
 
-        assert """Revision %r does not exist for this repository""" % (rev) in response.session['flash'][0][1], 'No flash message'
-        assert """%s""" % (HG_REPO) in response.session['flash'][0][1], 'No flash message'
+        msg = """Revision %r does not exist for this repository""" % (rev)
+        self.checkSessionFlash(response, msg)
 
-
+        msg = """%s""" % (HG_REPO)
+        self.checkSessionFlash(response, msg)
 
     def test_raw_file_wrong_f_path(self):
         self.log_user()
@@ -273,7 +266,9 @@
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
-        assert "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12]) in response.session['flash'][0][1], 'No flash message'
+
+        msg = "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12])
+        self.checkSessionFlash(response, msg)
 
     #==========================================================================
     # RAW RESPONSE - PLAIN
@@ -296,10 +291,11 @@
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
+        msg = """Revision %r does not exist for this repository""" % (rev)
+        self.checkSessionFlash(response, msg)
 
-        assert """Revision %r does not exist for this repository""" % (rev) in response.session['flash'][0][1], 'No flash message'
-        assert """%s""" % (HG_REPO) in response.session['flash'][0][1], 'No flash message'
-
+        msg = """%s""" % (HG_REPO)
+        self.checkSessionFlash(response, msg)
 
     def test_raw_wrong_f_path(self):
         self.log_user()
@@ -309,15 +305,14 @@
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
-
-        assert "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12]) in response.session['flash'][0][1], 'No flash message'
+        msg = "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12])
+        self.checkSessionFlash(response, msg)
 
     def test_ajaxed_files_list(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
-        response = self.app.get(url('files_nodelist_home',repo_name=HG_REPO,
-                                    f_path='/',
-                                    revision=rev),
-                                extra_environ={'HTTP_X_PARTIAL_XHR':'1'},
-                                )
-        self.assertTrue("vcs/web/simplevcs/views/repository.py" in response.body)
+        response = self.app.get(
+            url('files_nodelist_home', repo_name=HG_REPO,f_path='/',revision=rev),
+            extra_environ={'HTTP_X_PARTIAL_XHR': '1'},
+        )
+        response.mustcontain("vcs/web/simplevcs/views/repository.py")