Author: brane
Date: Tue May 20 07:55:55 2025
New Revision: 1925714
URL: http://svn.apache.org/viewvc?rev=1925714&view=rev
Log:
Tidy up a tiny corner of the svntest module.
* subversion/tests/cmdline/svntest/main.py:
Remove Python 2-specific imports. Use our predefined path name
variables when constructing paths.
* subversion/tests/cmdline/svntest/factory.py
(TestFactory.really_safe_rmtree): Use main.work_dir instead of a magic string.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/factory.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/factory.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/factory.py?rev=1925714&r1=1925713&r2=1925714&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/factory.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/factory.py Tue May 20
07:55:55 2025
@@ -972,7 +972,7 @@ class TestFactory:
def really_safe_rmtree(self, dir):
# Safety catch. We don't want to remove outside the sandbox.
- if dir.find('svn-test-work') < 0:
+ if dir.find(main.work_dir) < 0:
raise Failure("Tried to remove path outside working area: " + dir)
main.safe_rmtree(dir)
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1925714&r1=1925713&r2=1925714&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue May 20
07:55:55 2025
@@ -38,19 +38,11 @@ import logging
import hashlib
import zipfile
import codecs
+import queue
-try:
- # Python >=3.0
- import queue
- from urllib.parse import quote as urllib_parse_quote
- from urllib.parse import unquote as urllib_parse_unquote
- from urllib.parse import urlparse
-except ImportError:
- # Python <3.0
- import Queue as queue
- from urllib import quote as urllib_parse_quote
- from urllib import unquote as urllib_parse_unquote
- from urlparse import urlparse
+from urllib.parse import quote as urllib_parse_quote
+from urllib.parse import unquote as urllib_parse_unquote
+from urllib.parse import urlparse
import svntest
from svntest import Failure
@@ -462,9 +454,8 @@ def run_command(command, error_expected,
# then we can assume that the on-disk repository path was leaked to the
# client. Having these here as constants means we don't need to construct
# them over and over again.
-_repos_diskpath1 = os.path.join('cmdline', 'svn-test-work', 'repositories')
-_repos_diskpath2 = os.path.join('cmdline', 'svn-test-work', 'local_tmp',
- 'repos')
+_repos_diskpath1 = os.path.join('cmdline', general_repo_dir)
+_repos_diskpath2 = os.path.join('cmdline', pristine_greek_repos_dir)
_repos_diskpath1_bytes = _repos_diskpath1.encode()
_repos_diskpath2_bytes = _repos_diskpath2.encode()
