Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 50786 invoked from network); 2 Jul 2009 01:11:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Jul 2009 01:11:02 -0000 Received: (qmail 10128 invoked by uid 500); 2 Jul 2009 01:11:13 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 10062 invoked by uid 500); 2 Jul 2009 01:11:13 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 10053 invoked by uid 99); 2 Jul 2009 01:11:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2009 01:11:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2009 01:11:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12A0D238888E; Thu, 2 Jul 2009 01:10:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r790431 - /db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java Date: Thu, 02 Jul 2009 01:10:48 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090702011049.12A0D238888E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Thu Jul 2 01:10:48 2009 New Revision: 790431 URL: http://svn.apache.org/viewvc?rev=790431&view=rev Log: DERBY-4154 DboPowersTest should not hard upgrade the system/wombat database merged revision 788369 from trunk. Contributed by Dag H. Wanvik (dag dot wanvik at sun dot com) Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java?rev=790431&r1=790430&r2=790431&view=diff ============================================================================== --- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java (original) +++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java Thu Jul 2 01:10:48 2009 @@ -631,11 +631,22 @@ TestSuite suite = new TestSuite("dboPowers:"+framework); + // A priori, doing a hard upgrade is a no-op here; we are only + // interested in checking if we have the powers to do it. However, + // sometimes the regression suite is run against a default database + // (system/wombat) created by an earlier release to check soft upgrade + // modes. To avoid interfering with such usage, we use a + // singleUseDatabaseDecorator below, so we avoid accidentally hard + // upgrading system/wombat in such runs. The SQLAUTHORIZATION run takes + // care of itself since it uses another database anyway. + /* run tests with no authentication enabled */ - suite.addTest(tests[NOAUTHENTICATION]); + suite.addTest(TestConfiguration.singleUseDatabaseDecorator( + tests[NOAUTHENTICATION])); /* run test for all users with only authentication enabled */ - suite.addTest(tests[AUTHENTICATION]); + suite.addTest(TestConfiguration.singleUseDatabaseDecorator( + tests[AUTHENTICATION])); /* run test for all users with authentication and * sqlAuthorization enabled