Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.buildout
Commits
58346265
Commit
58346265
authored
May 15, 2020
by
Godefroid Chapelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: some tests do not pass on Windows
Solution: fix them
parent
b34b9bfd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
20 deletions
+28
-20
src/zc/buildout/buildout.txt
src/zc/buildout/buildout.txt
+1
-1
src/zc/buildout/tests.py
src/zc/buildout/tests.py
+4
-1
zc.recipe.egg_/src/zc/recipe/egg/api.rst
zc.recipe.egg_/src/zc/recipe/egg/api.rst
+1
-1
zc.recipe.egg_/src/zc/recipe/egg/tests.py
zc.recipe.egg_/src/zc/recipe/egg/tests.py
+22
-17
No files found.
src/zc/buildout/buildout.txt
View file @
58346265
...
@@ -390,7 +390,7 @@ we'll get a user error, not a traceback::
...
@@ -390,7 +390,7 @@ we'll get a user error, not a traceback::
>>> print_(system(buildout), end='')
>>> print_(system(buildout), end='')
Develop: '/sample-buildout/recipes'
Develop: '/sample-buildout/recipes'
data-dir: Cannot create
/xxx/mydata.
/xxx is not a directory.
data-dir: Cannot create
.../xxx/mydata. ...
/xxx is not a directory.
While:
While:
Installing.
Installing.
Getting section data-dir.
Getting section data-dir.
...
...
src/zc/buildout/tests.py
View file @
58346265
...
@@ -145,6 +145,9 @@ class TestEasyInstall(unittest.TestCase):
...
@@ -145,6 +145,9 @@ class TestEasyInstall(unittest.TestCase):
self
.
assertIsNotNone
(
result
)
self
.
assertIsNotNone
(
result
)
self
.
assertEqual
(
result
.
version
,
'3.3'
)
self
.
assertEqual
(
result
.
version
,
'3.3'
)
if
zc
.
buildout
.
WINDOWS
:
self
.
assertIn
(
dest
.
lower
(),
result
.
location
)
else
:
self
.
assertIn
(
dest
,
result
.
location
)
self
.
assertIn
(
dest
,
result
.
location
)
...
...
zc.recipe.egg_/src/zc/recipe/egg/api.rst
View file @
58346265
...
@@ -147,5 +147,5 @@ recipe instance:
...
@@ -147,5 +147,5 @@ recipe instance:
demo 0.2
demo 0.2
other 1.0
other 1.0
demoneeded 1.1
demoneeded 1.1
extra paths: ['
/foo/bar', '
/spam/eggs']
extra paths: ['
.../foo/bar', '...
/spam/eggs']
zc.recipe.egg_/src/zc/recipe/egg/tests.py
View file @
58346265
...
@@ -20,6 +20,7 @@ import shutil
...
@@ -20,6 +20,7 @@ import shutil
import
sys
import
sys
import
zc.buildout.tests
import
zc.buildout.tests
import
zc.buildout.testing
import
zc.buildout.testing
from
zc.buildout
import
WINDOWS
import
unittest
import
unittest
...
@@ -37,7 +38,7 @@ def setUp(test):
...
@@ -37,7 +38,7 @@ def setUp(test):
zc
.
buildout
.
testing
.
install_develop
(
'zc.recipe.egg'
,
test
)
zc
.
buildout
.
testing
.
install_develop
(
'zc.recipe.egg'
,
test
)
def
test_suite
():
def
test_suite
():
suite
=
unittest
.
TestSuite
((
suite
s
=
[
doctest
.
DocFileSuite
(
doctest
.
DocFileSuite
(
'README.rst'
,
'README.rst'
,
setUp
=
setUp
,
tearDown
=
zc
.
buildout
.
testing
.
buildoutTearDown
,
setUp
=
setUp
,
tearDown
=
zc
.
buildout
.
testing
.
buildoutTearDown
,
...
@@ -84,31 +85,35 @@ def test_suite():
...
@@ -84,31 +85,35 @@ def test_suite():
])
])
),
),
doctest.DocFileSuite(
doctest.DocFileSuite(
'
custom
.
rst
',
'
working_set_caching
.
rst
',
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
checker=renormalizing.RENormalizing([
checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found,
zc.buildout.testing.not_found,
zc.buildout.testing.python27_warning,
])
zc.buildout.testing.python27_warning_2,
(re.compile("(d ((ext)?demo(needed)?|other)"
r"-
\
d[.]
\
d-py)
\
d[.]
\
d(-
\
S+)?[.]egg
"
),
'
\\
1
V
.
V
.
egg
'),
]),
),
),
]
if not WINDOWS:
suites.append(
doctest.DocFileSuite(
doctest.DocFileSuite(
'
working_set_caching
.
rst
',
'
custom
.
rst
',
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
checker=renormalizing.RENormalizing([
checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found,
zc.buildout.testing.not_found,
])
zc.buildout.testing.python27_warning,
),
zc.buildout.testing.python27_warning_2,
))
(re.compile("(d ((ext)?demo(needed)?|other)"
r"-
\
d[.]
\
d-py)
\
d[.]
\
d(-
\
S+)?[.]egg
"
),
'
\\
1
V
.
V
.
egg
'),
]),
)
)
suite = unittest.TestSuite(suites)
return suite
return suite
if __name__ == '
__main__
':
if __name__ == '
__main__
':
...
...
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