Francois Gouget : testbot: Update Job::Restart() for the new Job file storage.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 1b47414ec3488d0e2d4221cd907033a064a9ab70
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=1b47414ec3488d0e2d4221cd...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Jun 12 11:48:51 2018 +0200

testbot: Update Job::Restart() for the new Job file storage.

With the new file storage scheme the Step directories only contain
generated files and thus they can all be deleted.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/lib/WineTestBot/Jobs.pm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index 3fd78aa..b3512e1 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -352,7 +352,6 @@ sub Restart($)
     return "This job is already " . $self->Status;
   }
 
-  my $FirstStep = 1;
   my $Steps = $self->Steps;
   my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()};
   foreach my $Step (@SortedSteps)
@@ -360,21 +359,13 @@ sub Restart($)
     my $Tasks = $Step->Tasks;
     foreach my $Task (@{$Tasks->GetItems()})
     {
-      if ($FirstStep)
-      {
-        # The first step contains the patch or test executable
-        # so only delete its task folders
-        $Task->RmTree();
-      }
       $Task->Status("queued");
       $Task->Started(undef);
       $Task->Ended(undef);
       $Task->TestFailures(undef);
     }
-    # Subsequent steps only contain files generated by the previous steps
-    $Step->RmTree() if (!$FirstStep);
-    $FirstStep = undef;
     $Step->Status("queued");
+    $Step->RmTree();
   }
   $self->Status("queued");
   $self->Submitted(time);