[otrs-cvs] UnitTest/bin UnitTestAutoSetup.pl,1.244,1.245
"CVS commits notifications of OTRS.org" <[email protected]>
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/UnitTest/bin
In directory lancelot:/tmp/cvs-serv21266/bin
Modified Files:
UnitTestAutoSetup.pl
Log Message:
Improved configuration of the scenarios.
Author: mh
Index: UnitTestAutoSetup.pl
===================================================================
RCS file: /home/cvs/UnitTest/bin/UnitTestAutoSetup.pl,v
retrieving revision 1.244
retrieving revision 1.245
diff -2 -u -d -r1.244 -r1.245
--- UnitTestAutoSetup.pl 11 Dec 2012 09:30:43 -0000 1.244
+++ UnitTestAutoSetup.pl 25 Jan 2013 11:22:44 -0000 1.245
@@ -2,5 +2,5 @@
# --
# bin/UnitTestAutoSetup.pl - auto setup for unit test hosts
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -35,5 +35,5 @@
if ( $Opts{h} ) {
print STDOUT "UnitTestAutoSetup.pl\n";
- print STDOUT "Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
+ print STDOUT "Copyright (C) 2001-2013 OTRS AG, http://otrs.org/\n";
print STDOUT
"usage: UnitTestAutoSetup.pl [-p <PROFILE_NAME>] [-d <DATABASE_NAME>] [-j just setup system]\n";
@@ -44,4 +44,9 @@
my $CheckOut = 'cvs -z9 -d :pserver:[email protected]:/home/cvs co';
+my @ForcedTests = (
+ '',
+ '',
+);
+
# define the test scenarios
my @Scenarios = (
@@ -75,13 +80,13 @@
},
{
- Test => [
- 'OrderManagement/OrderDocument',
- 'OrderManagement/OrderItem',
- 'OrderManagement/OrderItemGroup',
- ],
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=OTRSOrderManagement',
},
],
+ Tests => [
+ 'OrderManagement/OrderDocument',
+ 'OrderManagement/OrderItem',
+ 'OrderManagement/OrderItemGroup',
+ ],
},
@@ -114,18 +119,18 @@
},
{
- Test => [
- 'GenericInterface/Invoker/SolMan/AddInfo',
- 'GenericInterface/Invoker/SolMan/CloseIncident',
- 'GenericInterface/Invoker/SolMan/ProcessIncident',
- 'GenericInterface/Invoker/SolMan/ReplicateIncident',
- 'GenericInterface/Invoker/SolMan/RequestSystemGuid',
- 'GenericInterface/Operation/SolMan/Common',
- 'GenericInterface/Operation/SolMan/RequestSystemGuid',
- 'GenericInterface/Transport/HTTP/SolManMock',
- ],
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=OTRSGenericInterfaceConnectorSAPSolMan',
},
],
+ Tests => [
+ 'GenericInterface/Invoker/SolMan/AddInfo',
+ 'GenericInterface/Invoker/SolMan/CloseIncident',
+ 'GenericInterface/Invoker/SolMan/ProcessIncident',
+ 'GenericInterface/Invoker/SolMan/ReplicateIncident',
+ 'GenericInterface/Invoker/SolMan/RequestSystemGuid',
+ 'GenericInterface/Operation/SolMan/Common',
+ 'GenericInterface/Operation/SolMan/RequestSystemGuid',
+ 'GenericInterface/Transport/HTTP/SolManMock',
+ ],
},
@@ -180,38 +185,56 @@
},
{
- Test => 'GeneralCatalog',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=GeneralCatalog',
+ Upgrade => 1,
},
{
- Test => 'CustomerUserService:ITSMCIPAllocate:Service:SLA',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMCore',
+ Upgrade => 1,
},
{
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMIncidentProblemManagement',
+ Upgrade => 1,
},
{
- Test =>
- 'ITSMConfigItem:ImportExportObjectITSMConfigItem:ITSMConfigItemUniqueCIName',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMConfigurationManagement',
+ Upgrade => 1,
},
{
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMServiceLevelManagement',
+ Upgrade => 1,
},
{
- Test => 'ImportExport:ImportExportFormatCSV',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ImportExport',
+ Upgrade => 1,
},
{
- Test => 'ITSMChange:ITSMWorkOrder:ITSMStateMachine:ITSMCondition:ITSMTemplate',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMChangeManagement',
+ Upgrade => 1,
},
],
+ Tests => [
+ 'GeneralCatalog',
+ 'CustomerUserService',
+ 'ITSMCIPAllocate',
+ 'Service',
+ 'SLA',
+ 'ITSMConfigItem',
+ 'ImportExportObjectITSMConfigItem',
+ 'ITSMConfigItemUniqueCIName',
+ 'ImportExport',
+ 'ImportExportFormatCSV',
+ 'ITSMChange',
+ 'ITSMWorkOrder',
+ 'ITSMStateMachine',
+ 'ITSMCondition',
+ 'ITSMTemplate',
+ ],
},
@@ -229,10 +252,8 @@
},
{
- Test => 'GeneralCatalog',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=GeneralCatalog',
},
{
- Test => 'CustomerUserService:ITSMCIPAllocate:Service:SLA',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMCore',
@@ -243,6 +264,4 @@
},
{
- Test =>
- 'ITSMConfigItem:ImportExportObjectITSMConfigItem:ITSMConfigItemUniqueCIName',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMConfigurationManagement',
@@ -253,14 +272,29 @@
},
{
- Test => 'ImportExport:ImportExportFormatCSV',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ImportExport',
},
{
- Test => 'ITSMChange:ITSMWorkOrder:ITSMStateMachine:ITSMCondition:ITSMTemplate',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMChangeManagement',
},
],
+ Tests => [
+ 'GeneralCatalog',
+ 'CustomerUserService',
+ 'ITSMCIPAllocate',
+ 'Service',
+ 'SLA',
+ 'ITSMConfigItem',
+ 'ImportExportObjectITSMConfigItem',
+ 'ITSMConfigItemUniqueCIName',
+ 'ImportExport',
+ 'ImportExportFormatCSV',
+ 'ITSMChange',
+ 'ITSMWorkOrder',
+ 'ITSMStateMachine',
+ 'ITSMCondition',
+ 'ITSMTemplate',
+ ],
},
@@ -278,10 +312,8 @@
},
{
- Test => 'GeneralCatalog',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=GeneralCatalog&Branch=rel-3_1',
},
{
- Test => 'CustomerUserService:ITSMCIPAllocate:Service:SLA',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMCore&Branch=rel-3_1',
@@ -292,6 +324,4 @@
},
{
- Test =>
- 'ITSMConfigItem:ImportExportObjectITSMConfigItem:ITSMConfigItemUniqueCIName',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMConfigurationManagement&Branch=rel-3_1',
@@ -302,14 +332,29 @@
},
{
- Test => 'ImportExport:ImportExportFormatCSV',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ImportExport&Branch=rel-3_1',
},
{
- Test => 'ITSMChange:ITSMWorkOrder:ITSMStateMachine:ITSMCondition:ITSMTemplate',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=ITSMChangeManagement&Branch=rel-3_1',
},
],
+ Tests => [
+ 'GeneralCatalog',
+ 'CustomerUserService',
+ 'ITSMCIPAllocate',
+ 'Service',
+ 'SLA',
+ 'ITSMConfigItem',
+ 'ImportExportObjectITSMConfigItem',
+ 'ITSMConfigItemUniqueCIName',
+ 'ImportExport',
+ 'ImportExportFormatCSV',
+ 'ITSMChange',
+ 'ITSMWorkOrder',
+ 'ITSMStateMachine',
+ 'ITSMCondition',
+ 'ITSMTemplate',
+ ],
},
@@ -327,12 +372,12 @@
},
{
- Test => [
- 'FAQ',
- 'GenericInterface/FAQConnector',
- ],
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=FAQ',
},
],
+ Tests => [
+ 'FAQ',
+ 'GenericInterface/FAQConnector',
+ ],
},
@@ -350,9 +395,11 @@
},
{
- Test => 'FAQ',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=FAQ&Branch=rel-2_1',
},
],
+ Tests => [
+ 'FAQ',
+ ],
},
@@ -370,9 +417,11 @@
},
{
- Test => 'Survey',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=Survey',
},
],
+ Tests => [
+ 'Survey',
+ ],
},
@@ -390,9 +439,11 @@
},
{
- Test => 'Survey',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=Survey&Branch=rel-2_1',
},
],
+ Tests => [
+ 'Survey',
+ ],
},
@@ -410,9 +461,11 @@
},
{
- Test => 'TimeAccounting',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=TimeAccounting&Branch=rel-2_1',
},
],
+ Tests => [
+ 'TimeAccounting',
+ ],
},
@@ -430,9 +483,11 @@
},
{
- Test => 'TimeAccounting',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=TimeAccounting',
},
],
+ Tests => [
+ 'TimeAccounting',
+ ],
},
@@ -450,9 +505,11 @@
},
{
- Test => 'DynamicTicketTemplate',
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=OTRSTicketMaskExtensions',
},
],
+ Tests => [
+ 'DynamicTicketTemplate',
+ ],
},
@@ -470,24 +527,24 @@
},
{
- Test => [
- 'ProcessManagement/TransitionAction/ArticleCreate',
- 'ProcessManagement/TransitionAction/CustomerSet',
- 'ProcessManagement/TransitionAction/DynamicFieldSet',
- 'ProcessManagement/TransitionAction/OwnerSet',
- 'ProcessManagement/TransitionAction/QueueMove',
- 'ProcessManagement/TransitionAction/StateSet',
- 'ProcessManagement/TransitionAction/TicketUnlock',
- 'ProcessManagement/TransitionValidation/ValidateDemo',
- 'ProcessManagement/Activity',
- 'ProcessManagement/ActivityDialog',
- 'ProcessManagement/ActivityDialogACL',
- 'ProcessManagement/Process',
- 'ProcessManagement/Transition',
- 'ProcessManagement/TransitionAction',
- ],
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=OTRSTicketProcesses',
},
],
+ Tests => [
+ 'ProcessManagement/TransitionAction/ArticleCreate',
+ 'ProcessManagement/TransitionAction/CustomerSet',
+ 'ProcessManagement/TransitionAction/DynamicFieldSet',
+ 'ProcessManagement/TransitionAction/OwnerSet',
+ 'ProcessManagement/TransitionAction/QueueMove',
+ 'ProcessManagement/TransitionAction/StateSet',
+ 'ProcessManagement/TransitionAction/TicketUnlock',
+ 'ProcessManagement/TransitionValidation/ValidateDemo',
+ 'ProcessManagement/Activity',
+ 'ProcessManagement/ActivityDialog',
+ 'ProcessManagement/ActivityDialogACL',
+ 'ProcessManagement/Process',
+ 'ProcessManagement/Transition',
+ 'ProcessManagement/TransitionAction',
+ ],
},
@@ -517,15 +574,15 @@
},
{
- Test => [
- 'GenericInterface/Mapping/FusionInventory/BuildConfigItem',
- 'GenericInterface/Mapping/FusionInventory/ConfigCheck',
- 'GenericInterface/Mapping/FusionInventory/IdentifierMatches',
- 'GenericInterface/Mapping/FusionInventory/ReplaceValue',
- 'GenericInterface/Mapping/FusionInventory',
- ],
URL =>
'https://opms.otrs.com/otrs/:public.pl?Action=PublicOPMSTestBuild&NoDoc=1&Package=OTRSGenericInterfaceFusionInventory',
},
],
+ Tests => [
+ 'GenericInterface/Mapping/FusionInventory/BuildConfigItem',
+ 'GenericInterface/Mapping/FusionInventory/ConfigCheck',
+ 'GenericInterface/Mapping/FusionInventory/IdentifierMatches',
+ 'GenericInterface/Mapping/FusionInventory/ReplaceValue',
+ 'GenericInterface/Mapping/FusionInventory',
+ ],
},
);
@@ -1413,5 +1470,4 @@
# install packages and execute package tests
- my $PackageTest = 0;
if ( ref $Scenario->{Package} eq 'ARRAY' ) {
@@ -1419,4 +1475,5 @@
PACKAGE:
for my $Package ( @{ $Scenario->{Package} } ) {
+
print STDOUT "NOTICE: install $Package->{URL}\n";
@@ -1433,37 +1490,34 @@
system($Command) && next SCENARIO;
- sleep 2;
- next PACKAGE if !$Package->{Test};
+ sleep 1;
+ }
+ }
- $PackageTest = 1;
+ sleep 1;
- if ( ref $Package->{Test} eq 'ARRAY' ) {
- push @PackageTests, @{ $Package->{Test} };
- }
- else {
- push @PackageTests, $Package->{Test};
- }
+ # run the tests
+ if ( !$Opts{j} ) {
- print STDOUT "NOTICE: unit test @PackageTests\n";
- }
+ print STDOUT "NOTICE: Run the tests now!\n";
- if ( @PackageTests && !$Opts{j} ) {
+ # run defined tests
+ if ( $Scenario->{Tests} && ref $Scenario->{Tests} eq 'ARRAY' ) {
- my $PackageTestsString = join ':', @PackageTests;
+ my $PackageTestsString = join ':', @{ $Scenario->{Tests} };
system("$Scenario->{UnitTest} -n '$PackageTestsString' -p '$Scenario->{Name}'")
&& next SCENARIO;
}
- }
- # do framework test
- if ( !$PackageTest && !$Opts{j} ) {
- print STDOUT "NOTICE: unit test\n";
- system("$Scenario->{UnitTest} -p '$Scenario->{Name}'") && next SCENARIO;
+ # run all tests
+ else {
+ system("$Scenario->{UnitTest} -p '$Scenario->{Name}'") && next SCENARIO;
+ }
}
# uninstall packages
- if ( ref $Scenario->{Package} eq 'ARRAY' && !$Opts{j} ) {
+ if ( $Scenario->{Package} && ref $Scenario->{Package} eq 'ARRAY' && !$Opts{j} ) {
+
for my $Package ( reverse @{ $Scenario->{Package} } ) {
print STDOUT "NOTICE: uninstall $Package->{URL}\n";
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log