From patchwork Thu Apr 14 23:04:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Fasheh X-Patchwork-Id: 8843751 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E82CC9F3A0 for ; Thu, 14 Apr 2016 23:04:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A1CE2034C for ; Thu, 14 Apr 2016 23:04:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11DC8202FF for ; Thu, 14 Apr 2016 23:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752260AbcDNXER (ORCPT ); Thu, 14 Apr 2016 19:04:17 -0400 Received: from mx2.suse.de ([195.135.220.15]:52265 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbcDNXEQ (ORCPT ); Thu, 14 Apr 2016 19:04:16 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1C061AC75; Thu, 14 Apr 2016 23:04:08 +0000 (UTC) Date: Thu, 14 Apr 2016 16:04:09 -0700 From: Mark Fasheh To: fstests@vger.kernel.org Cc: Dave Chinner Subject: [PATCH] btrfs/104: remove ugly sleep Message-ID: <20160414230409.GO2187@wotan.suse.de> Reply-To: Mark Fasheh MIME-Version: 1.0 Content-Disposition: inline Organization: SUSE Labs User-Agent: Mutt/1.5.21 (2010-09-15) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Latest btrfsprogs can now do 'subvolume sync' to wait on snapshots to be dropped. Replace the sleep call in btrfs/104 with this. We can also add this test to the 'quick' group now. Signed-off-by: Mark Fasheh --- tests/btrfs/104 | 8 +++----- tests/btrfs/group | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/btrfs/104 b/tests/btrfs/104 index 6afaa02..627e77b 100755 --- a/tests/btrfs/104 +++ b/tests/btrfs/104 @@ -145,11 +145,9 @@ _scratch_cycle_mount # referenced above. _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap1 -# There is no way from userspace to force btrfs_drop_snapshot to run -# at a given time (even via mount/unmount). We must wait for it to -# start and complete. This is the shortest time on my tests systems I -# have found which always allows drop_snapshot to run to completion. -sleep 45 +# Removing snapshots on btrfs is a delayed operation, so we must wait for +# btrfs_drop_snapshot to complete. +_run_btrfs_util_prog subvolume sync $SCRATCH_MNT _scratch_unmount diff --git a/tests/btrfs/group b/tests/btrfs/group index ef6c260..9403daa 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -104,7 +104,7 @@ 101 auto quick replace 102 auto quick metadata enospc 103 auto quick clone compress -104 auto qgroup +104 auto quick qgroup 105 auto quick send 106 auto quick clone compress 107 auto quick prealloc