Module: tools Branch: master Commit: 34cd98d673174ddd64b8b9591a1b0187cb4851b6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=34cd98d673174ddd64b8b9591...
Author: Francois Gouget fgouget@codeweavers.com Date: Fri Aug 31 17:19:00 2012 +0200
testbot/VMs: Put the default type and status values first.
This way these will be the default in both MySQL and the GUI. New VMs are usually added as 'extra' and get promoted to 'base' when they have been tested. They should also initially be in the 'dirty' state so WineTestBot knows to put them it a clean state before using them.
---
testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 5e59321..5f885c4 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -45,10 +45,10 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE VMs ( Name VARCHAR(20) NOT NULL, - Type ENUM('base', 'extra', 'build', 'retired') NOT NULL, + Type ENUM('extra', 'base', 'build', 'retired') NOT NULL, SortOrder INT(3) NOT NULL, Bits ENUM('32', '64') NOT NULL, - Status ENUM('reverting', 'sleeping', 'idle', 'running', 'dirty', 'offline') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline') NOT NULL, VmxHost VARCHAR(64) NULL, VmxFilePath VARCHAR(64) NOT NULL, IdleSnapshot VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6e1145e..ef03889 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -558,10 +558,10 @@ BEGIN { @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), - CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['base', 'extra', 'build', 'retired']), + CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['extra', 'base', 'build', 'retired']), CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Bits", "32 or 64 bits", !1, 1, ['32', '64']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['idle', 'reverting', 'sleeping', 'running', 'dirty', 'offline']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline']), CreateBasicPropertyDescriptor("VmxHost", "Host where VM is located", !1, !1, "A", 64), CreateBasicPropertyDescriptor("VmxFilePath", "Path to .vmx file", !1, 1, "A", 64), CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32),