It was deprecated in favor of VM::ChildPid some time ago so it's now time to remove the database field.
Signed-off-by: Francois Gouget fgouget@codeweavers.com ---
This patch requires updating the database and restarting both the TestBot Engine and the web server.
testbot/ddl/update28.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Tasks.pm | 2 -- 4 files changed, 4 insertions(+), 26 deletions(-) create mode 100644 testbot/ddl/update28.sql
diff --git a/testbot/ddl/update28.sql b/testbot/ddl/update28.sql new file mode 100644 index 00000000..b9bb9d91 --- /dev/null +++ b/testbot/ddl/update28.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Tasks + DROP ChildPid; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index f8d590fe..12c1b689 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -150,7 +150,6 @@ CREATE TABLE Tasks VMName VARCHAR(20) NOT NULL, Timeout INT(4) NOT NULL, CmdLineArg VARCHAR(256) NULL, - ChildPid INT(5) NULL, Started DATETIME NULL, Ended DATETIME NULL, TestFailures INT(6) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index de91f9aa..9092c417 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2175,29 +2175,6 @@ dia:string##</dia:string> </dia:attribute> </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> - dia:string#ChildPid#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - dia:string#INT(5)#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - dia:string##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="true"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - dia:string##</dia:string> - </dia:attribute> - </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> dia:string#Started#</dia:string> diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b3b6ae3e..11f087f1 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -223,8 +223,6 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, &CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - # Note: ChildPid is not used anymore. - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6),