1.7.1dev: merge [17916] from 1.6-stable (fix for #13880)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17917 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jomae

trac/upgrades/tests/db32.py

@@ -146,13 +146,15 @@ def test_repository_providers_disabled(self):
         config.set('projects_list', projects_list)
         config.set('projects_base', projects_base)
         config.set('projects_url', projects_url)
+
+        abspath = os.path.abspath
         db_provider = DbRepositoryProvider(self.env)
-        db_provider.add_repository('repos3', '/var/git/repos3', 'git')
-        db_provider.add_repository('repos4', '/var/git/repos4', 'git')
+        db_provider.add_repository('repos3', abspath('/var/git/repos3'), 'git')
+        db_provider.add_repository('repos4', abspath('/var/git/repos4'), 'git')
         config = self.env.config['repositories']
-        config.set('repos5.dir', '/var/svn/repos4')
+        config.set('repos5.dir', abspath('/var/svn/repos4'))
         config.set('repos5.type', 'svn')
-        config.set('repos6.dir', '/var/svn/repos5')
+        config.set('repos6.dir', abspath('/var/svn/repos5'))
         config.set('repos6.type', 'svn')
         self.env.disable_component(GitwebProjectsRepositoryProvider)
         self.env.disable_component(DbRepositoryProvider)

trac/versioncontrol/tests/api.py

@@ -14,6 +14,7 @@
 #
 # Author: Eli Carter <[email protected]>
 
+import os.path
 import unittest
 from datetime import datetime
 
@@ -159,8 +160,9 @@ def do_alias(self, reponame, target, message):
                            reponame, target)
 
     def test_add_alias(self):
-        self.db_provider.add_repository('', '/path/to/repos')
-        self.db_provider.add_repository('target', '/path/to/repos')
+        repodir = os.path.abspath('/path/to/repos')
+        self.db_provider.add_repository('', repodir)
+        self.db_provider.add_repository('target', repodir)
         self.db_provider.add_alias('blah1', '')
         self.db_provider.add_alias('blah2', '(default)')
         self.db_provider.add_alias('blah3', 'target')
@@ -185,10 +187,11 @@ def test_add_alias_to_non_existent_repository(self):
         self.do_alias('(default)', 'blah', 'Repository "blah" doesn\'t exist')
 
     def test_add_alias_to_repository_in_tracini(self):
+        repodir = os.path.abspath('/path/to/repos')
         config = self.env.config
-        config.set('repositories', '.dir', '/path/to/repos')
+        config.set('repositories', '.dir', repodir)
         config.set('repositories', '.type', '')
-        config.set('repositories', 'target.dir', '/path/to/repos')
+        config.set('repositories', 'target.dir', repodir)
         config.set('repositories', 'target.type', '')
         config.set('repositories', 'alias-default.alias', '')
         config.set('repositories', 'alias-target.alias', 'target')
@@ -203,8 +206,9 @@ def test_add_alias_to_repository_in_tracini(self):
         self.assertEqual('target', repositories['blah2']['alias'])
 
     def test_add_alias_to_alias(self):
+        repodir = os.path.abspath('/path/to/repos')
         config = self.env.config
-        config.set('repositories', 'target.dir', '/path/to/repos')
+        config.set('repositories', 'target.dir', repodir)
         config.set('repositories', 'target.type', '')
         config.set('repositories', '.alias', 'target')
         config.set('repositories', 'alias.alias', 'target')
@@ -216,8 +220,9 @@ def test_add_alias_to_alias(self):
                       'Cannot create an alias to the alias "alias"')
 
     def test_remove_repository_used_in_aliases(self):
-        self.db_provider.add_repository('', '/path/to/repos')
-        self.db_provider.add_repository('blah', '/path/to/repos')
+        repodir = os.path.abspath('/path/to/repos')
+        self.db_provider.add_repository('', repodir)
+        self.db_provider.add_repository('blah', repodir)
         self.db_provider.add_alias('alias-blah', 'blah')
         self.db_provider.add_alias('alias-default', '')
         self.do_remove('', 'Cannot remove the repository "(default)" used in '
@@ -228,8 +233,9 @@ def test_remove_repository_used_in_aliases(self):
                                'aliases')
 
     def test_modify_repository_used_in_aliases(self):
-        self.db_provider.add_repository('', '/path/to/repos')
-        self.db_provider.add_repository('blah', '/path/to/repos')
+        repodir = os.path.abspath('/path/to/repos')
+        self.db_provider.add_repository('', repodir)
+        self.db_provider.add_repository('blah', repodir)
         self.db_provider.add_alias('alias-blah', 'blah')
         self.db_provider.add_alias('alias-default', '')
         self.do_modify('', {'name': 'new-name'},
@@ -250,7 +256,8 @@ def setUp(self):
 
     def test_pre_process_request_sync_skipped_for_invalid_connector(self):
         """Repository synchronization is skipped for an invalid connector."""
-        self.env.config.set('repositories', 'repos.dir', '/some/path')
+        repodir = os.path.abspath('/some/path')
+        self.env.config.set('repositories', 'repos.dir', repodir)
         self.env.config.set('repositories', 'repos.type', 'invalid')
         self.env.config.set('repositories', 'repos.sync_per_request', True)
         req = MockRequest(self.env)

trac/versioncontrol/tests/console.py

@@ -12,6 +12,7 @@
 # history and logs, available at https://trac.edgewall.org/log/.
 
 import datetime
+import os.path
 import unittest
 
 import trac.versioncontrol.admin
@@ -58,8 +59,9 @@ def setUp(self):
                                    disable=('trac.tests.*',))
         self.admin = TracAdmin()
         self.admin.env_set('', self.env)
+        repodir = os.path.abspath('/')
         provider = DbRepositoryProvider(self.env)
-        provider.add_repository('mock', '/', 'mock_type')
+        provider.add_repository('mock', repodir, 'mock_type')
 
     def tearDown(self):
         self.env = None

trac/versioncontrol/tests/functional.py

@@ -13,6 +13,7 @@
 # history and logs, available at https://trac.edgewall.org/log/.
 
 import os
+import re
 import tempfile
 import unittest
 
@@ -37,12 +38,18 @@ def runTest(self):
         """Repository with an invalid path is rendered with an error
         message on the repository admin page.
         """
+        if os.name == 'nt':
+            repodir = r'C:\the\invalid\path'
+            breakable = r'C:\{0}the\{0}invalid\{0}path'.format('\u200b')
+        else:
+            repodir = '/the/invalid/path'
+            breakable = '/the/\u200binvalid/\u200bpath'
         self._tester.go_to_admin("Repositories")
         tc.formvalue('trac-addrepos', 'name', 'InvalidRepos')
-        tc.formvalue('trac-addrepos', 'dir', '/the/invalid/path')
+        tc.formvalue('trac-addrepos', 'dir', repodir)
         tc.submit()
-        tc.find(('<span class="missing" title="[^"]*">'
-                 '/the/\u200binvalid/\u200bpath</span>'))
+        tc.find('<span class="missing" title="[^"]*">%s</span>' %
+                re.escape(breakable))
 
 
 class TestEmptySvnRepo(FunctionalTestCaseSetup):
@@ -161,7 +168,8 @@ def runTest(self):
         """
         def add_repository(name):
             tc.formvalue('trac-addrepos', 'name', name)
-            tc.formvalue('trac-addrepos', 'dir', '/var/svn/%s' % name)
+            tc.formvalue('trac-addrepos', 'dir',
+                         os.path.abspath('/var/svn/%s' % name))
             tc.submit()
 
         def go_to_repository_admin():
@@ -182,7 +190,8 @@ def go_to_repository_admin():
         # TracError raised if repository already defined in trac.ini.
         name2 = random_word().lower()
         env = self._testenv.get_trac_environment()
-        env.config.set('repositories', '%s.dir' % name2, '/var/svn/%s' % name2)
+        env.config.set('repositories', '%s.dir' % name2,
+                       os.path.abspath('/var/svn/%s' % name2))
         env.config.save()
         go_to_repository_admin()
         add_repository(name2)
@@ -204,7 +213,8 @@ def runTest(self):
         target = '%s_repos' % word
         name = '%s_alias' % word
         tc.formvalue('trac-addrepos', 'name', target)
-        tc.formvalue('trac-addrepos', 'dir', '/var/svn/%s' % target)
+        tc.formvalue('trac-addrepos', 'dir',
+                     os.path.abspath('/var/svn/%s' % target))
         tc.submit()
         # Jinja2 tc.find('The repository &#34;%s&#34; has been added.' % target)
         tc.find('The repository "%s" has been added.' % target)
@@ -249,12 +259,14 @@ def runTest(self):
         word = random_word()
         names = ['%s_%d' % (word, n) for n in range(3)]
         tc.formvalue('trac-addrepos', 'name', names[0])
-        tc.formvalue('trac-addrepos', 'dir', '/var/svn/%s' % names[0])
+        tc.formvalue('trac-addrepos', 'dir',
+                     os.path.abspath('/var/svn/%s' % names[0]))
         tc.submit()
         tc.notfind(internal_error)
 
         tc.formvalue('trac-addrepos', 'name', names[1])
-        tc.formvalue('trac-addrepos', 'dir', '/var/svn/%s' % names[1])
+        tc.formvalue('trac-addrepos', 'dir',
+                     os.path.abspath('/var/svn/%s' % names[1]))
         tc.submit()
         tc.notfind(internal_error)
 

trac/versioncontrol/web_ui/tests/browser.py

@@ -12,6 +12,7 @@
 # history and logs, available at https://trac.edgewall.org/.
 
 import io
+import os.path
 import posixpath
 import unittest
 import zipfile
@@ -142,11 +143,12 @@ class BrowserModulePermissionsTestCase(RequestHandlerPermissionsTestCaseBase):
 
     def setUp(self):
         super().setUp(BrowserModule)
+        repodir = os.path.abspath('/')
         provider = DbRepositoryProvider(self.env)
-        provider.add_repository('(default)', '/', 'mock')
-        provider.add_repository('allow', '/', 'mock')
-        provider.add_repository('deny', '/', 'mock')
-        provider.add_repository('raise', '/', 'mock')
+        provider.add_repository('(default)', repodir, 'mock')
+        provider.add_repository('allow', repodir, 'mock')
+        provider.add_repository('deny', repodir, 'mock')
+        provider.add_repository('raise', repodir, 'mock')
 
     def tearDown(self):
         RepositoryManager(self.env).reload_repositories()
@@ -283,8 +285,9 @@ def test_node_with_file_view(self):
             self.assertEqual('', e.resource.parent.id)
 
     def test_node_with_blame_view(self):
+        repodir = os.path.abspath('/')
         provider = DbRepositoryProvider(self.env)
-        provider.add_repository('metachars-&<>"\'-', '/', 'mock')
+        provider.add_repository('metachars-&<>"\'-', repodir, 'mock')
         self.grant_perm('anonymous', 'BROWSER_VIEW', 'FILE_VIEW')
 
         req = MockRequest(self.env, authname='anonymous',

trac/versioncontrol/web_ui/tests/log.py

@@ -12,6 +12,7 @@
 # history and logs, available at https://trac.edgewall.org/.
 
 from datetime import datetime, timedelta
+import os.path
 import unittest
 
 from trac.core import Component, TracError, implements
@@ -173,8 +174,9 @@ class LogModuleTestCase(RequestHandlerPermissionsTestCaseBase):
     def setUp(self):
         self._super = super()
         self._super.setUp(LogModule)
+        repodir = os.path.abspath('/')
         provider = DbRepositoryProvider(self.env)
-        provider.add_repository('mock', '/', mock_repotype)
+        provider.add_repository('mock', repodir, mock_repotype)
 
     def test_default_repository_not_configured(self):
         """Test for regression of https://trac.edgewall.org/ticket/11599."""