Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gevent
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
Kirill Smelkov
gevent
Commits
3f2d4a17
Commit
3f2d4a17
authored
Oct 20, 2015
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hmm, psutil worked on OS/X but not so on linux, so don't install it on travis.
parent
ebf1184e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
.travis.yml
.travis.yml
+1
-1
greentest/test__makefile_ref.py
greentest/test__makefile_ref.py
+2
-1
No files found.
.travis.yml
View file @
3f2d4a17
...
...
@@ -18,7 +18,7 @@ install:
# Then start installing our deps so they can be cached. Note that use of --build-options / --global-options / --install-options
# disables the cache.
# We need wheel>=0.26 on Python 3.5. See previous revisions.
-
travis_retry pip install -U wheel
psutil
-
travis_retry pip install -U wheel
-
travis_retry pip install -U tox cython greenlet pep8 pyflakes "coverage>=4.0" "coveralls>=1.0"
script
:
-
if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $LINT ==
true
]]; then python setup.py develop && make travis_test_linters; elif [[ $LINT ==
false
&& $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then python setup.py develop && make fulltoxtest; elif [[ $LINT ==
false
]]; then python setup.py develop && make fulltoxtest; fi
...
...
greentest/test__makefile_ref.py
View file @
3f2d4a17
...
...
@@ -55,6 +55,7 @@ else:
# (Running 14 tests takes 3.964s with lsof and 0.046 with psutil)
# However, it still doesn'
t
completely
solve
the
issue
on
Windows
:
fds
are
reported
# as -1 there, so we can't fully check those.
# XXX: Note: installing psutil on the travis linux vm caused failures.
process
=
psutil
.
Process
()
def
get_open_files
():
...
...
@@ -461,7 +462,7 @@ class TestSSL(Test):
self
.
assertEqual
(
f
.
read
(),
'test_serverssl_makefile2'
)
self
.
assertEqual
(
f
.
read
(),
''
)
f
.
close
()
if
WIN
and
psutil
and
not
PY3
:
if
WIN
and
psutil
:
# Hmm?
self
.
extra_allowed_open_states
=
(
psutil
.
CONN_CLOSE_WAIT
,)
self
.
assert_open
(
client_socket
,
fileno
)
...
...
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