| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: t_psshfs.sh,v 1.8 2016/09/05 08:53:57 christos Exp $ | | 1 | # $NetBSD: t_psshfs.sh,v 1.9 2017/05/24 15:29:51 christos Exp $ |
2 | # | | 2 | # |
3 | # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. | | 3 | # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. |
4 | # All rights reserved. | | 4 | # All rights reserved. |
5 | # | | 5 | # |
6 | # Redistribution and use in source and binary forms, with or without | | 6 | # Redistribution and use in source and binary forms, with or without |
7 | # modification, are permitted provided that the following conditions | | 7 | # modification, are permitted provided that the following conditions |
8 | # are met: | | 8 | # are met: |
9 | # 1. Redistributions of source code must retain the above copyright | | 9 | # 1. Redistributions of source code must retain the above copyright |
10 | # notice, this list of conditions and the following disclaimer. | | 10 | # notice, this list of conditions and the following disclaimer. |
11 | # 2. Redistributions in binary form must reproduce the above copyright | | 11 | # 2. Redistributions in binary form must reproduce the above copyright |
12 | # notice, this list of conditions and the following disclaimer in the | | 12 | # notice, this list of conditions and the following disclaimer in the |
13 | # documentation and/or other materials provided with the distribution. | | 13 | # documentation and/or other materials provided with the distribution. |
14 | # | | 14 | # |
| @@ -257,27 +257,27 @@ setattr_cache_body() { | | | @@ -257,27 +257,27 @@ setattr_cache_body() { |
257 | atf_check -s exit:0 -o file:stat stat mnt/loser | | 257 | atf_check -s exit:0 -o file:stat stat mnt/loser |
258 | } | | 258 | } |
259 | setattr_cache_cleanup() { | | 259 | setattr_cache_cleanup() { |
260 | umount mnt | | 260 | umount mnt |
261 | kill -CONT $(cat sshd.pid) | | 261 | kill -CONT $(cat sshd.pid) |
262 | stop_ssh | | 262 | stop_ssh |
263 | } | | 263 | } |
264 | | | 264 | |
265 | atf_test_case read_empty_file cleanup | | 265 | atf_test_case read_empty_file cleanup |
266 | read_empty_file_head() { | | 266 | read_empty_file_head() { |
267 | atf_set "descr" "Checks whether an empty file can be read" | | 267 | atf_set "descr" "Checks whether an empty file can be read" |
268 | # This test is supposed to make sure psshfs does not hang | | 268 | # This test is supposed to make sure psshfs does not hang |
269 | # when reading from an empty file, hence the timeout. | | 269 | # when reading from an empty file, hence the timeout. |
270 | atf_set "timeout" 8 | | 270 | atf_set "timeout" 60 |
271 | } | | 271 | } |
272 | read_empty_file_body() { | | 272 | read_empty_file_body() { |
273 | require_puffs | | 273 | require_puffs |
274 | start_ssh | | 274 | start_ssh |
275 | atf_check mkdir root mnt | | 275 | atf_check mkdir root mnt |
276 | atf_check -x ': > root/empty' | | 276 | atf_check -x ': > root/empty' |
277 | mount_psshfs root mnt | | 277 | mount_psshfs root mnt |
278 | atf_check cat mnt/empty | | 278 | atf_check cat mnt/empty |
279 | } | | 279 | } |
280 | read_empty_file_cleanup() { | | 280 | read_empty_file_cleanup() { |
281 | umount mnt | | 281 | umount mnt |
282 | stop_ssh | | 282 | stop_ssh |
283 | } | | 283 | } |