kallithea Changeset - 95800dad44d0

Changeset - 95800dad44d0

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-05-10 20:16:04
marcin@python-works.com

fixes for tests on Windows

3 files changed with 16 insertions and 14 deletions:

rhodecode/controllers/files.py

rhodecode/tests/functional/test_files.py

rhodecode/tests/test_models.py

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -48,6 +48,7 @@ from rhodecode.lib.vcs.nodes import File @@
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Repository
 from rhodecode.controllers.changeset import anchor_url, _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
@@ @@ -168,7 +169,7 @@ class FilesController(BaseRepoController @@
         file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path)
         response.content_disposition = 'attachment; filename=%s' % \
-            safe_str(f_path.split(os.sep)[-1])
+            safe_str(f_path.split(Repository.url_sep())[-1])
         response.content_type = file_node.mimetype
         return file_node.content

rhodecode/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -197,11 +197,13 @@ class TestFilesController(TestController @@
                                         repo_name=HG_REPO,
                                         fname=fname))
             assert response.status == '200 OK', 'wrong response code'
             assert response.response._headers.items() == [('Pragma', 'no-cache'),
             self.assertEqual(response.status, '200 OK')
             self.assertEqual(response.response._headers.items(),
              [('Pragma', 'no-cache'),
                                                   ('Cache-Control', 'no-cache'),
                                                   ('Content-Type', '%s; charset=utf-8' % info[0]),
                                                   ('Content-Disposition', 'attachment; filename=%s' % filename), ], 'wrong headers'
               ('Content-Disposition', 'attachment; filename=%s' % filename),]
+            )
     def test_archival_wrong_ext(self):
         self.log_user()
@@ @@ -212,8 +214,7 @@ class TestFilesController(TestController @@
             response = self.app.get(url(controller='files', action='archivefile',
                                         repo_name=HG_REPO,
                                         fname=fname))
             assert 'Unknown archive type' in response.body
             response.mustcontain('Unknown archive type')
     def test_archival_wrong_revision(self):
         self.log_user()
@@ @@ -224,7 +225,7 @@ class TestFilesController(TestController @@
             response = self.app.get(url(controller='files', action='archivefile',
                                         repo_name=HG_REPO,
                                         fname=fname))
-            assert 'Unknown revision' in response.body
+            response.mustcontain('Unknown revision')
     #==========================================================================
     # RAW FILE
@@ @@ -236,8 +237,8 @@ class TestFilesController(TestController @@
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py'))
         assert response.content_disposition == "attachment; filename=nodes.py"
         assert response.content_type == "text/x-python"
         self.assertEqual(response.content_disposition, "attachment; filename=nodes.py")
         self.assertEqual(response.content_type, "text/x-python")
     def test_raw_file_wrong_cs(self):
         self.log_user()
@@ @@ -277,7 +278,7 @@ class TestFilesController(TestController @@
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py'))
-        assert response.content_type == "text/plain"
+        self.assertEqual(response.content_type, "text/plain")
     def test_raw_wrong_cs(self):
         self.log_user()

rhodecode/tests/test_models.py

➞

Show inline comments

@@ @@ -5,7 +5,8 @@ from rhodecode.tests import * @@
 from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import RepoGroup, User, Notification, UserNotification, \
     UsersGroup, UsersGroupMember, Permission, UsersGroupRepoGroupToPerm
     UsersGroup, UsersGroupMember, Permission, UsersGroupRepoGroupToPerm,\
     Repository
 from sqlalchemy.exc import IntegrityError
 from rhodecode.model.user import UserModel
@@ @@ -153,8 +154,7 @@ class TestReposGroups(unittest.TestCase) @@
         self.assertTrue(self.__check_path('g2', 'g1'))
         # test repo
         self.assertEqual(r.repo_name, os.path.join('g2', 'g1', r.just_name))
         self.assertEqual(r.repo_name, RepoGroup.url_sep().join(['g2', 'g1', r.just_name]))
     def test_move_to_root(self):
         g1 = _make_group('t11')
@@ @@ -620,7 +620,7 @@ class TestPermissions(unittest.TestCase) @@
         # add repo to group
         form_data = {
             'repo_name':HG_REPO,
-            'repo_name_full':os.path.join(self.g1.group_name,HG_REPO),
+            'repo_name_full':RepoGroup.url_sep().join([self.g1.group_name,HG_REPO]),
             'repo_type':'hg',
             'clone_uri':'',
             'repo_group':self.g1.group_id,

0 comments (0 inline, 0 general)