From: <st...@us...> - 2008-06-06 23:10:16
|
Revision: 6656 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6656&view=rev Author: steve_l Date: 2008-06-06 16:10:15 -0700 (Fri, 06 Jun 2008) Log Message: ----------- SFOS-890 Chmod "failing" tests are failing and marked as skipped Modified Paths: -------------- trunk/core/testharness/build.xml trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/chmodTests.sf Added Paths: ----------- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodFailureTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFails.sf trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFailsRecursively.sf Modified: trunk/core/testharness/build.xml =================================================================== --- trunk/core/testharness/build.xml 2008-06-06 23:05:09 UTC (rev 6655) +++ trunk/core/testharness/build.xml 2008-06-06 23:10:15 UTC (rev 6656) @@ -177,7 +177,7 @@ <exclude name="${systemtests}/reference/constant/ConstantReferenceTest.*" unless="run.failing.tests"/> - <!-- SFOS-654 Create a chmod component. --> + <!-- SFOS-890 Chmod "failing" tests are failing and marked as skipped --> <exclude name="${systemtests}/filesystem/ChmodFailureTest.*" unless="run.failing.tests"/> Copied: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodFailureTest.java (from rev 6643, trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodTest.java) =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodFailureTest.java (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodFailureTest.java 2008-06-06 23:10:15 UTC (rev 6656) @@ -0,0 +1,52 @@ +/* (C) Copyright 2008 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + +package org.smartfrog.test.system.filesystem; + +import org.smartfrog.test.DeployingTestBase; + +/** + * Test chmod failure semantics + */ +public class ChmodFailureTest extends DeployingTestBase { + public static final String FILES = "org/smartfrog/test/system/filesystem/"; + + public ChmodFailureTest(String name) { + super(name); + } + + /** + * test case + * @throws Throwable on failure + */ + + public void testChmodFails() throws Throwable { + expectSuccessfulTestRun(FILES, "testChmodFails"); + } + + /** + * test case + * @throws Throwable on failure + */ + public void testChmodFailsRecursively() throws Throwable { + expectSuccessfulTestRun(FILES, "testChmodFailsRecursively"); + } + +} \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodTest.java 2008-06-06 23:05:09 UTC (rev 6655) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/ChmodTest.java 2008-06-06 23:10:15 UTC (rev 6656) @@ -29,25 +29,34 @@ super(name); } -// public void testChmodFails() throws Throwable { -// expectSuccessfulTestRun(FILES, "testChmodFails"); -// } -// -// public void testChmodFailsRecursively() throws Throwable { -// expectSuccessfulTestRun(FILES, "testChmodFailsRecursively"); -// } - + /** + * test case + * @throws Throwable on failure + */ public void testRemoveAllRights() throws Throwable { expectSuccessfulTestRunOrSkip(FILES, "testRemoveAllRights"); } + /** + * test case + * @throws Throwable on failure + */ public void testRestoreReadPermissions() throws Throwable { expectSuccessfulTestRunOrSkip(FILES, "testRestoreReadPermissions"); } + /** + * test case + * @throws Throwable on failure + */ public void testRestoreWritePermissions() throws Throwable { expectSuccessfulTestRunOrSkip(FILES, "testRestoreWritePermissions"); } + + /** + * test case + * @throws Throwable on failure + */ public void testRestoreRWPermissions() throws Throwable { expectSuccessfulTestRunOrSkip(FILES, "testRestoreRWPermissions"); } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/chmodTests.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/chmodTests.sf 2008-06-06 23:05:09 UTC (rev 6655) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/chmodTests.sf 2008-06-06 23:10:15 UTC (rev 6656) @@ -49,45 +49,45 @@ sfShouldTerminate true; } -//testChmodFails extends ExpectDeployFailure { -// condition IsUnix; -// -// description "removes read flag from a testfile and tries to read it"; -// expectTerminate false; -// -// action extends createTestEnv { -// -// } -// -// tests extends Sequence { -// rmReadRights extends Chmod { -// file LAZY PARENT:PARENT:action:testFile1; -// userPermissions "-r"; -// groupPermissions "-r"; -// otherPermissions "-r"; -// } -// -// loadFile extends LoadPropertyFile { -// resource LAZY PARENT:PARENT:action:testFile1; -// } -// } -//} -// -//testChmodFailsRecursively extends testChmodFails { -// description "removes read flags from files recursively and tries to read a file"; -// -// tests extends Sequence { -// rmReadRights extends Chmod { -// file LAZY PARENT:PARENT:action:testDir; -// recursively true; -// } -// -// loadFile extends LoadPropertyFile { -// resource LAZY PARENT:PARENT:action:testFile2; -// } -// } -//} +testChmodFails extends ExpectDeployFailure { + condition IsUnix; + description "removes read flag from a testfile and tries to read it"; + expectTerminate false; + + action extends createTestEnv { + + } + + tests extends Sequence { + rmReadRights extends Chmod { + file LAZY PARENT:PARENT:action:testFile1; + userPermissions "-r"; + groupPermissions "-r"; + otherPermissions "-r"; + } + + loadFile extends LoadPropertyFile { + resource LAZY PARENT:PARENT:action:testFile1; + } + } +} + +testChmodFailsRecursively extends testChmodFails { + description "removes read flags from files recursively and tries to read a file"; + + tests extends Sequence { + rmReadRights extends Chmod { + file LAZY PARENT:PARENT:action:testDir; + recursively true; + } + + loadFile extends LoadPropertyFile { + resource LAZY PARENT:PARENT:action:testFile2; + } + } +} + testRemoveAllRights extends ExpectDeploy { condition IsUnix; Added: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFails.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFails.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFails.sf 2008-06-06 23:10:15 UTC (rev 6656) @@ -0,0 +1,23 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "/org/smartfrog/test/system/filesystem/chmodTests.sf" + +sfConfig extends testChmodFails; \ No newline at end of file Added: trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFailsRecursively.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFailsRecursively.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/filesystem/testChmodFailsRecursively.sf 2008-06-06 23:10:15 UTC (rev 6656) @@ -0,0 +1,23 @@ +/** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "/org/smartfrog/test/system/filesystem/chmodTests.sf" + +sfConfig extends testChmodFailsRecursively; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |