Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caucase
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
caucase
Commits
5af60b32
Commit
5af60b32
authored
Jul 07, 2022
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caucase.test: Drop dependency on deprecated distutils module.
parent
4966706d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
caucase/test.py
caucase/test.py
+13
-9
No files found.
caucase/test.py
View file @
5af60b32
...
...
@@ -31,9 +31,6 @@ except ImportError: # pragma: no cover
# BBB: py2.7
from
Cookie
import
SimpleCookie
import
datetime
# pylint: disable=no-name-in-module, import-error
from
distutils.spawn
import
find_executable
# pylint: enable=no-name-in-module, import-error
import
errno
import
functools
import
glob
...
...
@@ -3839,12 +3836,19 @@ if getattr(CaucaseTest, 'assertItemsEqual', None) is None: # pragma: no cover
CaucaseTest
.
assertItemsEqual
=
CaucaseTest
.
assertCountEqual
# pylint: enable=no-member
_caucase_sh_path
=
find_executable
(
'caucase.sh'
,
path
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
os
.
path
.
pardir
,
'shell'
,
)
+
os
.
path
.
pathsep
+
os
.
getenv
(
'PATH'
,
''
),
)
def
_findCaucaseSh
():
file_directory
=
os
.
path
.
dirname
(
__file__
)
caucase_sh
=
'caucase.sh'
for
path
in
[
file_directory
,
os
.
path
.
join
(
file_directory
,
os
.
path
.
pardir
,
'shell'
),
]
+
os
.
getenv
(
'PATH'
,
''
).
split
(
os
.
path
.
pathsep
):
# pragma: no cover
result
=
os
.
path
.
join
(
path
,
caucase_sh
)
if
os
.
path
.
isfile
(
result
):
return
result
return
None
# pragma: no cover
_caucase_sh_path
=
_findCaucaseSh
()
def
_runCaucaseSh
(
*
args
):
command
=
(
_caucase_sh_path
,
)
+
args
environ
=
os
.
environ
.
copy
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment