From patchwork Mon Oct 19 21:48:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 7440261 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E676BBEEA4 for ; Mon, 19 Oct 2015 21:48:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BF0020604 for ; Mon, 19 Oct 2015 21:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FC1520574 for ; Mon, 19 Oct 2015 21:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754177AbbJSVsE (ORCPT ); Mon, 19 Oct 2015 17:48:04 -0400 Received: from fieldses.org ([173.255.197.46]:50410 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752594AbbJSVsE (ORCPT ); Mon, 19 Oct 2015 17:48:04 -0400 Received: by fieldses.org (Postfix, from userid 2815) id 3E0AFC5A; Mon, 19 Oct 2015 17:48:01 -0400 (EDT) Date: Mon, 19 Oct 2015 17:48:01 -0400 From: Bruce Fields To: Frank Filz Cc: linux-nfs@vger.kernel.org Subject: Re: Pull request for pynfs Message-ID: <20151019214801.GA16551@fieldses.org> References: <012101d10853$7cae4ac0$760ae040$@mindspring.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <012101d10853$7cae4ac0$760ae040$@mindspring.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.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 On Fri, Oct 16, 2015 at 01:44:42PM -0700, Frank Filz wrote: > Bruce, > > Please pull the top patch from: > > https://github.com/ffilz/pynfs/commits/master > > It fixes CID2 to allow NFS4_OK when SETCLIENTID with a different principal > replaces a clientid that has no state, and adds CID2a which expects > NFS4ERR_CLID_INUSE since it does have state. Thanks! This leave us with two test functions both named "testInUse". I applied the following to get both tests working. --b. --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/nfs4.0/servertests/st_setclientid.py b/nfs4.0/servertests/st_setclientid.py index 0fb59cd7f542..fbeab22e5026 100644 --- a/nfs4.0/servertests/st_setclientid.py +++ b/nfs4.0/servertests/st_setclientid.py @@ -50,7 +50,7 @@ def testClientUpdateCallback(t, env): res = c.close_file(t.code, fh, stateid) check(res, msg="Close after updating callback info") -def testInUse(t, env): +def testNotInUse(t, env): """SETCLIENTID with same nfs_client_id.id should return NFS4ERR_OK if there is no active state