1.1 --- a/vcs.advanced/test/qa-functional/src/complete/cvs_profile/JellyCommands.java	Tue Oct 29 18:01:10 2002 +0000
     1.2 +++ b/vcs.advanced/test/qa-functional/src/complete/cvs_profile/JellyCommands.java	Tue Oct 29 18:17:10 2002 +0000
     1.3 @@ -102,6 +102,20 @@
     1.4          imfile = new MyNode (imdir, "imfile");
     1.5      }
     1.6      
     1.7 +    public void deleteRecursively (File file) {
     1.8 +        File[] fs = file.listFiles();
     1.9 +        if (fs == null)
    1.10 +            return;
    1.11 +        for (int a = 0; a < fs.length; a ++) {
    1.12 +            File f = fs[a];
    1.13 +            if (!f.exists())
    1.14 +                continue;
    1.15 +            if (!file.isFile())
    1.16 +                deleteRecursively (fs[a]);
    1.17 +            info.println ("Deleting: " + file + " Return: " + file.delete ());
    1.18 +        }
    1.19 +    }
    1.20 +    
    1.21      public void testRelease () {
    1.22          String str, s;
    1.23          MyNode releaseNode = new MyNode (root, "releasedirectory");
    1.24 @@ -143,11 +157,17 @@
    1.25          str = new JLabelOperator (dia, releaseNode.name ()).getText ();
    1.26          dia.yes ();
    1.27          dia.waitClosed();
    1.28 -//        Helper.waitNoNode (exp.repositoryTab ().tree (), root.node (), releaseNode.name()); # fails due to bug #28223
    1.29 +//        Helper.waitNoNode (exp.repositoryTab ().tree (), root.node (), releaseNode.name()); // fails due to bug #28223
    1.30          for (int a = 0; a < 60; a ++) {
    1.31              Helper.sleep (1000);
    1.32 -            if (!new File (releaseFileNode1.file ()).exists()  &&  !new File (releaseFileNode2.file ()).exists())
    1.33 +            if (!new File (releaseFileNode1.file ()).exists()  &&  !new File (releaseFileNode2.file ()).exists()) {
    1.34 +                Helper.sleep (10000); // recovery from bug #28223
    1.35 +                if (new File (releaseNode.file ()).exists ()) { // recovery from bug #28223
    1.36 +                    info.println ("Recovering from bug #28223"); // recovery from bug #28223
    1.37 +                    deleteRecursively (new File (releaseNode.file ())); // recovery from bug #28223
    1.38 +                }
    1.39                  return;
    1.40 +            }
    1.41          }
    1.42          assertTrue ("Timeout: ReleaseFileNodes still exists", false);
    1.43      }