[PATCH 2/2] testbot: Remove uneeded WineTestBot::{Jobs, Patches, Users} prefixes.

Francois Gouget fgouget at codeweavers.com
Thu Apr 26 02:45:38 CDT 2018


They are no longer needed now that the Jobs <-> Patches circular
dependency is handled correctly.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 testbot/lib/WineTestBot/Jobs.pm    | 4 ++--
 testbot/lib/WineTestBot/Patches.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index edfe91660..2dfadb00b 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -426,13 +426,13 @@ my @PropertyDescriptors = (
   CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S",  5),
   CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1),
   CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]),
-  CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]),
+  CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]),
   CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1),
   CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']),
   CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128),
   CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19),
   CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19),
-  CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]),
+  CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&CreatePatches, ["PatchId"]),
   CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps),
 );
 SetDetailrefKeyPrefix("Job", @PropertyDescriptors);
diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm
index 5431d9f68..955e33617 100644
--- a/testbot/lib/WineTestBot/Patches.pm
+++ b/testbot/lib/WineTestBot/Patches.pm
@@ -244,7 +244,7 @@ sub Submit($$$)
   my $First = 1;
   foreach my $Module (keys %Modules)
   {
-    my $Jobs = WineTestBot::Jobs::CreateJobs();
+    my $Jobs = CreateJobs();
 
     # Create a new job for this patch
     my $NewJob = $Jobs->Add();
@@ -343,7 +343,7 @@ sub Submit($$$)
   }
   $self->Disposition($Disposition);
 
-  WineTestBot::Jobs::ScheduleJobs();
+  ScheduleJobs();
 
   return undef;
 }
-- 
2.17.0



More information about the wine-devel mailing list