diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.pytest_cache/.gitignore | 2 | ||||
| -rw-r--r-- | tests/.pytest_cache/README.md | 8 | ||||
| -rw-r--r-- | tests/.pytest_cache/v/cache/lastfailed | 1 | ||||
| -rw-r--r-- | tests/.pytest_cache/v/cache/nodeids | 376 | ||||
| -rwxr-xr-x | tests/t4_fuse.py | 9 | ||||
| -rw-r--r-- | tests/t5_cache.py | 6 |
6 files changed, 12 insertions, 390 deletions
diff --git a/tests/.pytest_cache/.gitignore b/tests/.pytest_cache/.gitignore deleted file mode 100644 index 2f50ec6..0000000 --- a/tests/.pytest_cache/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# created by pytest automatically, do not change -*
\ No newline at end of file diff --git a/tests/.pytest_cache/README.md b/tests/.pytest_cache/README.md deleted file mode 100644 index bb78ba0..0000000 --- a/tests/.pytest_cache/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# pytest cache directory # - -This directory contains data from the pytest's cache plugin, -which provides the `--lf` and `--ff` options, as well as the `cache` fixture. - -**Do not** commit this to version control. - -See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information. diff --git a/tests/.pytest_cache/v/cache/lastfailed b/tests/.pytest_cache/v/cache/lastfailed deleted file mode 100644 index 9e26dfe..0000000 --- a/tests/.pytest_cache/v/cache/lastfailed +++ /dev/null @@ -1 +0,0 @@ -{}
\ No newline at end of file diff --git a/tests/.pytest_cache/v/cache/nodeids b/tests/.pytest_cache/v/cache/nodeids deleted file mode 100644 index 42fe6c2..0000000 --- a/tests/.pytest_cache/v/cache/nodeids +++ /dev/null @@ -1,376 +0,0 @@ -[ - "t1_backends.py::test_read_write[local/aes]", - "t1_backends.py::test_read_write[mock-s3c/aes]", - "t1_backends.py::test_read_write[mock-gs/aes]", - "t1_backends.py::test_read_write[mock-swift/aes0]", - "t1_backends.py::test_read_write[mock-swift/aes1]", - "t1_backends.py::test_read_write[mock-swift/aes2]", - "t1_backends.py::test_read_write[local/aes+zlib]", - "t1_backends.py::test_read_write[mock-s3c/aes+zlib]", - "t1_backends.py::test_read_write[mock-gs/aes+zlib]", - "t1_backends.py::test_read_write[mock-swift/aes+zlib0]", - "t1_backends.py::test_read_write[mock-swift/aes+zlib1]", - "t1_backends.py::test_read_write[mock-swift/aes+zlib2]", - "t1_backends.py::test_read_write[local/plain]", - "t1_backends.py::test_read_write[mock-s3c/plain]", - "t1_backends.py::test_read_write[mock-gs/plain]", - "t1_backends.py::test_read_write[mock-swift/plain0]", - "t1_backends.py::test_read_write[mock-swift/plain1]", - "t1_backends.py::test_read_write[mock-swift/plain2]", - "t1_backends.py::test_read_write[local/zlib]", - "t1_backends.py::test_read_write[mock-s3c/zlib]", - "t1_backends.py::test_read_write[mock-gs/zlib]", - "t1_backends.py::test_read_write[mock-swift/zlib0]", - "t1_backends.py::test_read_write[mock-swift/zlib1]", - "t1_backends.py::test_read_write[mock-swift/zlib2]", - "t1_backends.py::test_read_write[local/bzip2]", - "t1_backends.py::test_read_write[mock-s3c/bzip2]", - "t1_backends.py::test_read_write[mock-gs/bzip2]", - "t1_backends.py::test_read_write[mock-swift/bzip20]", - "t1_backends.py::test_read_write[mock-swift/bzip21]", - "t1_backends.py::test_read_write[mock-swift/bzip22]", - "t1_backends.py::test_read_write[local/lzma]", - "t1_backends.py::test_read_write[mock-s3c/lzma]", - "t1_backends.py::test_read_write[mock-gs/lzma]", - "t1_backends.py::test_read_write[mock-swift/lzma0]", - "t1_backends.py::test_read_write[mock-swift/lzma1]", - "t1_backends.py::test_read_write[mock-swift/lzma2]", - "t1_backends.py::test_read_write[local/raw]", - "t1_backends.py::test_read_write[mock-s3c/raw]", - "t1_backends.py::test_read_write[mock-gs/raw]", - "t1_backends.py::test_read_write[mock-swift/raw0]", - "t1_backends.py::test_read_write[mock-swift/raw1]", - "t1_backends.py::test_read_write[mock-swift/raw2]", - "t1_backends.py::test_issue114[mock-swift/raw0]", - "t1_backends.py::test_issue114[mock-swift/raw1]", - "t1_backends.py::test_issue114[mock-swift/raw2]", - "t1_backends.py::test_complex_meta[local/raw]", - "t1_backends.py::test_complex_meta[mock-s3c/raw]", - "t1_backends.py::test_complex_meta[mock-gs/raw]", - "t1_backends.py::test_complex_meta[mock-swift/raw0]", - "t1_backends.py::test_complex_meta[mock-swift/raw1]", - "t1_backends.py::test_complex_meta[mock-swift/raw2]", - "t1_backends.py::test_complex_meta[local/plain]", - "t1_backends.py::test_complex_meta[local/aes]", - "t1_backends.py::test_complex_meta[local/zlib]", - "t1_backends.py::test_list[local/aes]", - "t1_backends.py::test_list[mock-s3c/aes]", - "t1_backends.py::test_list[mock-gs/aes]", - "t1_backends.py::test_list[mock-swift/aes0]", - "t1_backends.py::test_list[mock-swift/aes1]", - "t1_backends.py::test_list[mock-swift/aes2]", - "t1_backends.py::test_readslowly[local/raw]", - "t1_backends.py::test_readslowly[mock-s3c/raw]", - "t1_backends.py::test_readslowly[mock-gs/raw]", - "t1_backends.py::test_readslowly[mock-swift/raw0]", - "t1_backends.py::test_readslowly[mock-swift/raw1]", - "t1_backends.py::test_readslowly[mock-swift/raw2]", - "t1_backends.py::test_readslowly[local/plain]", - "t1_backends.py::test_readslowly[local/aes]", - "t1_backends.py::test_readslowly[local/zlib]", - "t1_backends.py::test_readslowly[local/aes+zlib]", - "t1_backends.py::test_delete[local/aes]", - "t1_backends.py::test_delete[mock-s3c/aes]", - "t1_backends.py::test_delete[mock-gs/aes]", - "t1_backends.py::test_delete[mock-swift/aes0]", - "t1_backends.py::test_delete[mock-swift/aes1]", - "t1_backends.py::test_delete[mock-swift/aes2]", - "t1_backends.py::test_delete_multi[local/aes]", - "t1_backends.py::test_delete_multi[mock-s3c/aes]", - "t1_backends.py::test_delete_multi[mock-gs/aes]", - "t1_backends.py::test_delete_multi[mock-swift/aes0]", - "t1_backends.py::test_delete_multi[mock-swift/aes1]", - "t1_backends.py::test_delete_multi[mock-swift/aes2]", - "t1_backends.py::test_clear[local/aes]", - "t1_backends.py::test_clear[mock-s3c/aes]", - "t1_backends.py::test_clear[mock-gs/aes]", - "t1_backends.py::test_clear[mock-swift/aes0]", - "t1_backends.py::test_clear[mock-swift/aes1]", - "t1_backends.py::test_clear[mock-swift/aes2]", - "t1_backends.py::test_copy[local/raw]", - "t1_backends.py::test_copy[mock-s3c/raw]", - "t1_backends.py::test_copy[mock-gs/raw]", - "t1_backends.py::test_copy[mock-swift/raw0]", - "t1_backends.py::test_copy[mock-swift/raw1]", - "t1_backends.py::test_copy[mock-swift/raw2]", - "t1_backends.py::test_copy[local/plain]", - "t1_backends.py::test_copy[local/aes]", - "t1_backends.py::test_copy[local/zlib]", - "t1_backends.py::test_copy_special[local/raw]", - "t1_backends.py::test_copy_special[mock-s3c/raw]", - "t1_backends.py::test_copy_special[mock-gs/raw]", - "t1_backends.py::test_copy_special[mock-swift/raw0]", - "t1_backends.py::test_copy_special[mock-swift/raw1]", - "t1_backends.py::test_copy_special[mock-swift/raw2]", - "t1_backends.py::test_copy_newmeta[local/raw]", - "t1_backends.py::test_copy_newmeta[mock-s3c/raw]", - "t1_backends.py::test_copy_newmeta[mock-gs/raw]", - "t1_backends.py::test_copy_newmeta[mock-swift/raw0]", - "t1_backends.py::test_copy_newmeta[mock-swift/raw1]", - "t1_backends.py::test_copy_newmeta[mock-swift/raw2]", - "t1_backends.py::test_copy_newmeta[local/aes]", - "t1_backends.py::test_copy_newmeta[local/zlib]", - "t1_backends.py::test_rename[local/raw]", - "t1_backends.py::test_rename[mock-s3c/raw]", - "t1_backends.py::test_rename[mock-gs/raw]", - "t1_backends.py::test_rename[mock-swift/raw0]", - "t1_backends.py::test_rename[mock-swift/raw1]", - "t1_backends.py::test_rename[mock-swift/raw2]", - "t1_backends.py::test_rename[local/aes]", - "t1_backends.py::test_rename[local/zlib]", - "t1_backends.py::test_rename_newmeta[local/raw]", - "t1_backends.py::test_rename_newmeta[mock-s3c/raw]", - "t1_backends.py::test_rename_newmeta[mock-gs/raw]", - "t1_backends.py::test_rename_newmeta[mock-swift/raw0]", - "t1_backends.py::test_rename_newmeta[mock-swift/raw1]", - "t1_backends.py::test_rename_newmeta[mock-swift/raw2]", - "t1_backends.py::test_rename_newmeta[local/aes]", - "t1_backends.py::test_rename_newmeta[local/zlib]", - "t1_backends.py::test_update_meta[local/raw]", - "t1_backends.py::test_update_meta[mock-s3c/raw]", - "t1_backends.py::test_update_meta[mock-gs/raw]", - "t1_backends.py::test_update_meta[mock-swift/raw0]", - "t1_backends.py::test_update_meta[mock-swift/raw1]", - "t1_backends.py::test_update_meta[mock-swift/raw2]", - "t1_backends.py::test_update_meta[local/aes]", - "t1_backends.py::test_update_meta[local/zlib]", - "t1_backends.py::test_copy_error[mock-s3c/raw]", - "t1_backends.py::test_copy_error[mock-s3c/aes]", - "t1_backends.py::test_copy_error[mock-s3c/zlib]", - "t1_backends.py::test_corruption[local/aes]", - "t1_backends.py::test_corruption[local/aes+zlib]", - "t1_backends.py::test_corruption[local/zlib]", - "t1_backends.py::test_corruption[local/bzip2]", - "t1_backends.py::test_corruption[local/lzma]", - "t1_backends.py::test_extra_data[local/aes]", - "t1_backends.py::test_extra_data[local/aes+zlib]", - "t1_backends.py::test_extra_data[local/zlib]", - "t1_backends.py::test_extra_data[local/bzip2]", - "t1_backends.py::test_extra_data[local/lzma]", - "t1_backends.py::test_multi_packet[local/raw]", - "t1_backends.py::test_multi_packet[mock-s3c/raw]", - "t1_backends.py::test_multi_packet[mock-gs/raw]", - "t1_backends.py::test_multi_packet[mock-swift/raw0]", - "t1_backends.py::test_multi_packet[mock-swift/raw1]", - "t1_backends.py::test_multi_packet[mock-swift/raw2]", - "t1_backends.py::test_multi_packet[local/plain]", - "t1_backends.py::test_multi_packet[mock-s3c/plain]", - "t1_backends.py::test_multi_packet[mock-gs/plain]", - "t1_backends.py::test_multi_packet[mock-swift/plain0]", - "t1_backends.py::test_multi_packet[mock-swift/plain1]", - "t1_backends.py::test_multi_packet[mock-swift/plain2]", - "t1_backends.py::test_multi_packet[local/aes]", - "t1_backends.py::test_multi_packet[mock-s3c/aes]", - "t1_backends.py::test_multi_packet[mock-gs/aes]", - "t1_backends.py::test_multi_packet[mock-swift/aes0]", - "t1_backends.py::test_multi_packet[mock-swift/aes1]", - "t1_backends.py::test_multi_packet[mock-swift/aes2]", - "t1_backends.py::test_multi_packet[local/aes+zlib]", - "t1_backends.py::test_multi_packet[mock-s3c/aes+zlib]", - "t1_backends.py::test_multi_packet[mock-gs/aes+zlib]", - "t1_backends.py::test_multi_packet[mock-swift/aes+zlib0]", - "t1_backends.py::test_multi_packet[mock-swift/aes+zlib1]", - "t1_backends.py::test_multi_packet[mock-swift/aes+zlib2]", - "t1_backends.py::test_multi_packet[local/zlib]", - "t1_backends.py::test_multi_packet[mock-s3c/zlib]", - "t1_backends.py::test_multi_packet[mock-gs/zlib]", - "t1_backends.py::test_multi_packet[mock-swift/zlib0]", - "t1_backends.py::test_multi_packet[mock-swift/zlib1]", - "t1_backends.py::test_multi_packet[mock-swift/zlib2]", - "t1_backends.py::test_issue431[local/raw]", - "t1_backends.py::test_issue431[local/plain]", - "t1_backends.py::test_issue431[local/aes]", - "t1_backends.py::test_issue431[local/aes+zlib]", - "t1_backends.py::test_issue431[local/zlib]", - "t1_backends.py::test_encryption[local/aes]", - "t1_backends.py::test_encryption[local/aes+zlib]", - "t1_backends.py::test_replay[local/aes]", - "t1_backends.py::test_replay[local/aes+zlib]", - "t1_backends.py::test_list_bug[mock-s3c/raw]", - "t1_backends.py::test_corrupted_get[mock-s3c/aes+zlib]", - "t1_backends.py::test_corrupted_meta[mock-s3c/raw]", - "t1_backends.py::test_corrupted_meta[mock-s3c/aes+zlib]", - "t1_backends.py::test_corrupted_put[mock-s3c/raw]", - "t1_backends.py::test_corrupted_put[mock-s3c/aes+zlib]", - "t1_backends.py::test_get_s3error[mock-s3c/raw]", - "t1_backends.py::test_get_s3error[mock-s3c/aes+zlib]", - "t1_backends.py::test_head_s3error[mock-s3c/raw]", - "t1_backends.py::test_head_s3error[mock-s3c/aes+zlib]", - "t1_backends.py::test_delete_s3error[mock-s3c/raw]", - "t1_backends.py::test_backoff[mock-s3c/raw]", - "t1_backends.py::test_httperror[mock-s3c/raw]", - "t1_backends.py::test_put_s3error_early[mock-s3c/raw]", - "t1_backends.py::test_put_s3error_early[mock-s3c/aes+zlib]", - "t1_backends.py::test_put_s3error_med[mock-s3c/raw]", - "t1_backends.py::test_put_s3error_med[mock-s3c/aes+zlib]", - "t1_backends.py::test_put_s3error_late[mock-s3c/raw]", - "t1_backends.py::test_put_s3error_late[mock-s3c/aes+zlib]", - "t1_backends.py::test_issue58[mock-s3c/raw]", - "t1_backends.py::test_issue58[mock-s3c/aes+zlib]", - "t1_backends.py::test_issue58_b[mock-s3c/raw]", - "t1_backends.py::test_issue58_b[mock-s3c/aes+zlib]", - "t1_backends.py::test_expired_token_get[mock-gs/raw]", - "t1_backends.py::test_expired_token_get[mock-gs/aes+zlib]", - "t1_backends.py::test_expired_token_put[mock-gs/raw]", - "t1_backends.py::test_expired_token_put[mock-gs/aes+zlib]", - "t1_backends.py::test_conn_abort[mock-s3c/raw]", - "t1_backends.py::test_conn_abort[mock-s3c/aes+zlib]", - "t1_dump.py::DumpTests::test_1_vals_1", - "t1_dump.py::DumpTests::test_1_vals_2", - "t1_dump.py::DumpTests::test_1_vals_3", - "t1_dump.py::DumpTests::test_2_buf_auto", - "t1_dump.py::DumpTests::test_2_buf_fixed", - "t1_dump.py::DumpTests::test_3_deltas_1", - "t1_dump.py::DumpTests::test_3_deltas_2", - "t1_dump.py::DumpTests::test_3_deltas_3", - "t1_dump.py::DumpTests::test_5_multi", - "t1_dump.py::DumpTests::test_transactions", - "t1_retry.py::test_retry", - "t1_retry.py::test_retry_generator", - "t1_retry.py::test_is_retry", - "t1_retry.py::test_logging", - "t1_serialization.py::test_simple", - "t1_serialization.py::test_wrong_key", - "t1_serialization.py::test_cmplx_value", - "t1_serialization.py::test_thaw_errors", - "t1_serialization.py::test_checksum", - "t1_serialization.py::test_checksum_bytes", - "t2_block_cache.py::test_thread_hang", - "t2_block_cache.py::test_get", - "t2_block_cache.py::test_expire", - "t2_block_cache.py::test_upload", - "t2_block_cache.py::test_remove_referenced", - "t2_block_cache.py::test_remove_cache", - "t2_block_cache.py::test_upload_race", - "t2_block_cache.py::test_expire_race", - "t2_block_cache.py::test_parallel_expire", - "t2_block_cache.py::test_remove_cache_db", - "t2_block_cache.py::test_remove_db", - "t2_block_cache.py::test_issue_241", - "t3_fs_api.py::test_getattr_root", - "t3_fs_api.py::test_create", - "t3_fs_api.py::test_extstat", - "t3_fs_api.py::test_getxattr", - "t3_fs_api.py::test_link", - "t3_fs_api.py::test_listxattr", - "t3_fs_api.py::test_read", - "t3_fs_api.py::test_readdir", - "t3_fs_api.py::test_forget", - "t3_fs_api.py::test_removexattr", - "t3_fs_api.py::test_rename", - "t3_fs_api.py::test_replace_file", - "t3_fs_api.py::test_replace_dir", - "t3_fs_api.py::test_setattr_one", - "t3_fs_api.py::test_setattr_two", - "t3_fs_api.py::test_truncate", - "t3_fs_api.py::test_truncate_0", - "t3_fs_api.py::test_setxattr", - "t3_fs_api.py::test_names", - "t3_fs_api.py::test_statfs", - "t3_fs_api.py::test_symlink", - "t3_fs_api.py::test_unlink", - "t3_fs_api.py::test_rmdir", - "t3_fs_api.py::test_relink", - "t3_fs_api.py::test_write", - "t3_fs_api.py::test_failsafe", - "t3_fs_api.py::test_create_open", - "t3_fs_api.py::test_edit", - "t3_fs_api.py::test_copy_tree", - "t3_fs_api.py::test_copy_tree_2", - "t3_fs_api.py::test_lock_tree", - "t3_fs_api.py::test_remove_tree", - "t3_fsck.py::fsck_tests::test_blocks_checksum", - "t3_fsck.py::fsck_tests::test_blocks_obj_id", - "t3_fsck.py::fsck_tests::test_cache", - "t3_fsck.py::fsck_tests::test_contents_inode", - "t3_fsck.py::fsck_tests::test_contents_inode_p", - "t3_fsck.py::fsck_tests::test_contents_name", - "t3_fsck.py::fsck_tests::test_ext_attrs_inode", - "t3_fsck.py::fsck_tests::test_ext_attrs_name", - "t3_fsck.py::fsck_tests::test_inode_blocks_block_id", - "t3_fsck.py::fsck_tests::test_inode_blocks_inode", - "t3_fsck.py::fsck_tests::test_inodes_size", - "t3_fsck.py::fsck_tests::test_lof1", - "t3_fsck.py::fsck_tests::test_lof2", - "t3_fsck.py::fsck_tests::test_loops", - "t3_fsck.py::fsck_tests::test_missing_obj", - "t3_fsck.py::fsck_tests::test_name_refcount", - "t3_fsck.py::fsck_tests::test_obj_refcounts", - "t3_fsck.py::fsck_tests::test_objects_id", - "t3_fsck.py::fsck_tests::test_orphaned_block", - "t3_fsck.py::fsck_tests::test_orphaned_inode", - "t3_fsck.py::fsck_tests::test_orphaned_name", - "t3_fsck.py::fsck_tests::test_orphaned_obj", - "t3_fsck.py::fsck_tests::test_symlinks_inode", - "t3_fsck.py::fsck_tests::test_tmpfile", - "t3_fsck.py::fsck_tests::test_unix_blocks", - "t3_fsck.py::fsck_tests::test_unix_child", - "t3_fsck.py::fsck_tests::test_unix_nomode_dir", - "t3_fsck.py::fsck_tests::test_unix_nomode_reg", - "t3_fsck.py::fsck_tests::test_unix_rdev", - "t3_fsck.py::fsck_tests::test_unix_size", - "t3_fsck.py::fsck_tests::test_unix_size_symlink", - "t3_fsck.py::fsck_tests::test_unix_symlink_no_target", - "t3_fsck.py::fsck_tests::test_unix_target", - "t3_fsck.py::fsck_tests::test_wrong_block_refcount", - "t3_fsck.py::fsck_tests::test_wrong_inode_refcount", - "t3_inode_cache.py::cache_tests::test_create", - "t3_inode_cache.py::cache_tests::test_del", - "t3_inode_cache.py::cache_tests::test_get", - "t3_verify.py::test_missing[True]", - "t3_verify.py::test_missing[False]", - "t3_verify.py::test_corrupted_head[True]", - "t3_verify.py::test_corrupted_head[False]", - "t3_verify.py::test_corrupted_body[True]", - "t3_verify.py::test_corrupted_body[False]", - "t4_adm.py::AdmTests::test_authinfo", - "t4_adm.py::AdmTests::test_key_recovery", - "t4_adm.py::AdmTests::test_passphrase", - "t4_fuse.py::TestFuse::()::test", - "t5_cache.py::TestPerstCache::()::test", - "t5_cache.py::TestPerstCache::()::test_cache_upload", - "t5_cache.py::TestPerstCache::()::test_cache_flush[True]", - "t5_cache.py::TestPerstCache::()::test_cache_flush[False]", - "t5_cache.py::TestPerstCache::()::test_cache_flush_unclean", - "t5_cp.py::TestCp::()::test", - "t5_ctrl.py::TestCtrl::()::test", - "t5_failsafe.py::TestFailsafe::()::test", - "t5_failsafe.py::TestNewerMetadata::()::test", - "t5_fsck.py::TestFsck::()::test", - "t5_full.py::TestFulls3::()::test", - "t5_full.py::TestFullrackspace::()::test", - "t5_full.py::TestFullswift::()::test", - "t5_full.py::TestFullgs::()::test", - "t5_full.py::TestFulls3c::()::test", - "t5_full.py::TestFullswiftks::()::test", - "t5_full.py::TestFull::()::test", - "t5_lock_rm.py::TestLockRemove::()::test", - "t6_upgrade.py::TestswiftUpgrade::()::test[True]", - "t6_upgrade.py::TestswiftUpgrade::()::test[False]", - "t6_upgrade.py::Tests3cUpgrade::()::test[True]", - "t6_upgrade.py::Tests3cUpgrade::()::test[False]", - "t6_upgrade.py::TestPlains3Upgrade::()::test[True]", - "t6_upgrade.py::TestPlains3Upgrade::()::test[False]", - "t6_upgrade.py::Tests3Upgrade::()::test[True]", - "t6_upgrade.py::Tests3Upgrade::()::test[False]", - "t6_upgrade.py::TestgsUpgrade::()::test[True]", - "t6_upgrade.py::TestgsUpgrade::()::test[False]", - "t6_upgrade.py::TestrackspaceUpgrade::()::test[True]", - "t6_upgrade.py::TestrackspaceUpgrade::()::test[False]", - "t6_upgrade.py::TestPlainswiftUpgrade::()::test[True]", - "t6_upgrade.py::TestPlainswiftUpgrade::()::test[False]", - "t6_upgrade.py::TestPlaingsUpgrade::()::test[True]", - "t6_upgrade.py::TestPlaingsUpgrade::()::test[False]", - "t6_upgrade.py::TestPlainrackspaceUpgrade::()::test[True]", - "t6_upgrade.py::TestPlainrackspaceUpgrade::()::test[False]", - "t6_upgrade.py::TestPlainswiftksUpgrade::()::test[True]", - "t6_upgrade.py::TestPlainswiftksUpgrade::()::test[False]", - "t6_upgrade.py::TestswiftksUpgrade::()::test[True]", - "t6_upgrade.py::TestswiftksUpgrade::()::test[False]", - "t6_upgrade.py::TestPlains3cUpgrade::()::test[True]", - "t6_upgrade.py::TestPlains3cUpgrade::()::test[False]", - "t6_upgrade.py::TestUpgrade::()::test[True]", - "t6_upgrade.py::TestUpgrade::()::test[False]", - "t6_upgrade.py::TestPlainUpgrade::()::test[True]", - "t6_upgrade.py::TestPlainUpgrade::()::test[False]" -]
\ No newline at end of file diff --git a/tests/t4_fuse.py b/tests/t4_fuse.py index 0e3f5c4..8321298 100755 --- a/tests/t4_fuse.py +++ b/tests/t4_fuse.py @@ -147,10 +147,13 @@ class TestFuse: # Give mount process a little while to terminate if self.mount_process is not None: try: - retry(90, lambda : self.mount_process.poll() is not None) + retry(10, lambda : self.mount_process.poll() is not None) except TimeoutError: - # Ignore errors during teardown - pass + self.mount_process.terminate() + try: + self.mount_process.wait(1) + except subprocess.TimeoutExpired: + self.mount_process.kill() shutil.rmtree(self.cache_dir) shutil.rmtree(self.backend_dir) diff --git a/tests/t5_cache.py b/tests/t5_cache.py index cfdc2ea..bf4fc46 100644 --- a/tests/t5_cache.py +++ b/tests/t5_cache.py @@ -19,6 +19,7 @@ import os import shutil import tempfile import subprocess +import time from os.path import join as pjoin with open(__file__, 'rb') as fh: @@ -137,6 +138,11 @@ class TestPerstCache(t4_fuse.TestFuse): # Kill mount self.flush_cache() self.upload_meta() + + # Metadata upload is not blocking, so give it some time to + # complete + time.sleep(1) + self.mount_process.kill() self.mount_process.wait() self.umount_fuse() |