fixes failing job unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e61ecef5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e61ecef5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e61ecef5 Branch: refs/heads/master Commit: e61ecef5b5f63c15a4837b82903817b14d05fdbc Parents: b4cf948 Author: Jeremy Mitchell <[email protected]> Authored: Fri Apr 14 09:12:24 2017 -0600 Committer: Dewayne Richardson <[email protected]> Committed: Fri Apr 14 13:08:20 2017 -0600 ---------------------------------------------------------------------- traffic_ops/app/lib/Fixtures/JobAgent.pm | 3 +-- traffic_ops/app/lib/Fixtures/JobStatus.pm | 27 +------------------------- traffic_ops/app/lib/Test/TestHelper.pm | 8 +++++++- 3 files changed, 9 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e61ecef5/traffic_ops/app/lib/Fixtures/JobAgent.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Fixtures/JobAgent.pm b/traffic_ops/app/lib/Fixtures/JobAgent.pm index 0fc224e..01bd83a 100644 --- a/traffic_ops/app/lib/Fixtures/JobAgent.pm +++ b/traffic_ops/app/lib/Fixtures/JobAgent.pm @@ -34,8 +34,7 @@ sub get_definition { } sub all_fixture_names { - # sort by db name to guarantee insertion order - return (sort { $definition_for{$a}{using}{id} cmp $definition_for{$b}{using}{id} } keys %definition_for); + return keys %definition_for; } __PACKAGE__->meta->make_immutable; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e61ecef5/traffic_ops/app/lib/Fixtures/JobStatus.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Fixtures/JobStatus.pm b/traffic_ops/app/lib/Fixtures/JobStatus.pm index 5bab0c6..68b0efa 100644 --- a/traffic_ops/app/lib/Fixtures/JobStatus.pm +++ b/traffic_ops/app/lib/Fixtures/JobStatus.pm @@ -26,30 +26,6 @@ my %definition_for = ( description => 'Job is queued, but has not been picked up by any agents yet' }, }, - in_progress => { - new => 'JobStatus', - using => { - id => 2, - name => 'IN_PROGRESS', - description => 'Job is being processed by agents' - }, - }, - completed => { - new => 'JobStatus', - using => { - id => 3, - name => 'COMPLETED', - description => 'Job has finished' - }, - }, - cancelled => { - new => 'JobStatus', - using => { - id => 4, - name => 'CANCELLED', - description => 'Job was cancelled' - }, - }, ); sub get_definition { @@ -58,8 +34,7 @@ sub get_definition { } sub all_fixture_names { - # sort by db name to guarantee insertion order - return (sort { $definition_for{$a}{using}{id} cmp $definition_for{$b}{using}{id} } keys %definition_for); + return keys %definition_for; } __PACKAGE__->meta->make_immutable; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e61ecef5/traffic_ops/app/lib/Test/TestHelper.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Test/TestHelper.pm b/traffic_ops/app/lib/Test/TestHelper.pm index 3d6c566..90570c6 100644 --- a/traffic_ops/app/lib/Test/TestHelper.pm +++ b/traffic_ops/app/lib/Test/TestHelper.pm @@ -32,6 +32,8 @@ use Fixtures::Asn; use Fixtures::Cachegroup; use Fixtures::EdgeCachegroup; use Fixtures::Job; +use Fixtures::JobAgent; +use Fixtures::JobStatus; use Fixtures::Profile; use Fixtures::Parameter; use Fixtures::ProfileParameter; @@ -111,7 +113,7 @@ sub load_core_data { $self->reset_sequence_id(); - $self->load_all_fixtures( Fixtures::Tenant->new($schema_values) ); + $self->load_all_fixtures( Fixtures::Tenant->new($schema_values) ); $self->load_all_fixtures( Fixtures::Cdn->new($schema_values) ); $self->load_all_fixtures( Fixtures::Role->new($schema_values) ); $self->load_all_fixtures( Fixtures::TmUser->new($schema_values) ); @@ -132,6 +134,8 @@ sub load_core_data { $self->load_all_fixtures( Fixtures::DeliveryserviceRegex->new($schema_values) ); $self->load_all_fixtures( Fixtures::DeliveryserviceTmuser->new($schema_values) ); $self->load_all_fixtures( Fixtures::DeliveryserviceServer->new($schema_values) ); + $self->load_all_fixtures( Fixtures::JobStatus->new($schema_values) ); + $self->load_all_fixtures( Fixtures::JobAgent->new($schema_values) ); $self->load_all_fixtures( Fixtures::Job->new($schema_values) ); } @@ -142,6 +146,8 @@ sub unload_core_data { $self->teardown($schema, 'ToExtension'); $self->teardown($schema, 'Staticdnsentry'); $self->teardown($schema, 'Job'); + $self->teardown($schema, 'JobAgent'); + $self->teardown($schema, 'JobStatus'); $self->teardown($schema, 'Log'); $self->teardown($schema, 'Asn'); $self->teardown($schema, 'DeliveryserviceTmuser');
