Skip to content

Commit

Permalink
Timeout tests (#28)
Browse files Browse the repository at this point in the history
* Raise error when failing to create new channel object. 
* Added timeout settings tests.
* Added check for new local libssh install dir. Updated gitignore.
* Updated manifest
* Updated changelog
  • Loading branch information
pkittenis authored Oct 3, 2020
1 parent 5f90e62 commit 75eaec4
Show file tree
Hide file tree
Showing 7 changed files with 811 additions and 803 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ build
*~
*.so*
src
local
libssh/compile_commands.json
wheelhouse
.idea
1 change: 1 addition & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Changes
-------

* Updated embedded libssh to ``0.9.5``.
* ``Session.channel_new`` now raises ``ssh.exceptions.ChannelOpenFailure`` on failure to create new channel.

0.6.0
+++++
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include LICENSE
include COPYING
include ssh/*.pyx
include ssh/*.pxd
include ssh/*.c
recursive-include libssh *
include ci/build_ssh.sh
include _setup_libssh.py
3 changes: 2 additions & 1 deletion _setup_libssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def build_ssh():
os.mkdir('local/lib')
# Depending on architecture cmake installs libraries into lib64,
# but we don't care about that.
os.symlink('lib', 'local/lib64')
if not os.path.exists('local/lib64'):
os.symlink('lib', 'local/lib64')

os.chdir('src')
check_call('cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../local -DWITH_GSS_API=ON ../libssh',
Expand Down
Loading

0 comments on commit 75eaec4

Please sign in to comment.