diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/test_sshfs.py | 8 | ||||
| -rwxr-xr-x | test/travis-install.sh | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/test/test_sshfs.py b/test/test_sshfs.py index 00ea6a8..675fab3 100755 --- a/test/test_sshfs.py +++ b/test/test_sshfs.py @@ -30,7 +30,7 @@ def name_generator(__ctr=[0]): return 'testfile_%d' % __ctr[0] @pytest.mark.parametrize("debug", (False, True)) -@pytest.mark.parametrize("cache_timeout", (0, 1)) +@pytest.mark.parametrize("cache_timeout", (0,1)) @pytest.mark.parametrize("sync_rd", (True, False)) def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, capfd): @@ -64,10 +64,10 @@ def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, capfd): # SSHFS Cache if cache_timeout == 0: - cmdline += [ '-o', 'cache=no' ] + cmdline += [ '-o', 'dir_cache=no' ] else: - cmdline += [ '-o', 'cache_timeout=%d' % cache_timeout, - '-o', 'cache=yes' ] + cmdline += [ '-o', 'dcache_timeout=%d' % cache_timeout, + '-o', 'dir_cache=yes' ] # FUSE Cache cmdline += [ '-o', 'entry_timeout=0', diff --git a/test/travis-install.sh b/test/travis-install.sh index d7d1f05..514f931 100755 --- a/test/travis-install.sh +++ b/test/travis-install.sh @@ -13,9 +13,20 @@ valgrind --version ninja --version meson --version +# Install fuse +wget https://github.com/libfuse/libfuse/releases/download/fuse-3.0.2/fuse-3.0.2.tar.gz +tar xzf fuse-3.0.2.tar.gz +cd fuse-3.0.2 +mkdir build +cd build +meson .. +ninja +sudo ninja install +test -e /usr/local/lib/pkgconfig || sudo mkdir /usr/local/lib/pkgconfig +sudo mv /usr/local/lib/*/pkgconfig/* /usr/local/lib/pkgconfig/ + # Setup ssh ssh-keygen -b 768 -t rsa -f ~/.ssh/id_rsa -P '' cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys chmod 600 ~/.ssh/authorized_keys ssh -o "StrictHostKeyChecking=no" localhost echo "SSH connection succeeded" - |