You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/14 17:07:18 UTC
[15/53] [abbrv] incubator-trafficcontrol git commit: fixing tests.
fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9135384f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9135384f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9135384f
Branch: refs/heads/psql-rebase
Commit: 9135384fb48abbf051ce790f390816f3c87e6be4
Parents: 969a182
Author: Jackie Heitzer <ja...@cable.comcast.com>
Authored: Wed Aug 3 11:58:52 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 13:26:35 2016 -0700
----------------------------------------------------------------------
.../app/lib/Fixtures/DeliveryserviceRegex.pm | 38 ++++++++++----------
traffic_ops/app/lib/Fixtures/Parameter.pm | 2 +-
traffic_ops/app/t/api/1.1/job.t | 6 ++--
3 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9135384f/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
index 7d3edb5..f1716b1 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceRegex.pm
@@ -18,27 +18,27 @@ extends 'DBIx::Class::EasyFixture';
use namespace::autoclean;
my %definition_for = (
- regex1 => {
+ regex2 => {
new => 'DeliveryserviceRegex',
using => {
- deliveryservice => 1,
- regex => 2,
+ deliveryservice => 9,
+ regex => 7,
set_number => 0,
},
},
- regex2 => {
+ target_r1_filter => {
new => 'DeliveryserviceRegex',
using => {
- deliveryservice => 2,
+ deliveryservice => 4,
regex => 1,
set_number => 0,
},
},
- target_r1_filter => {
+ regex1 => {
new => 'DeliveryserviceRegex',
using => {
- deliveryservice => 4,
- regex => 1,
+ deliveryservice => 8,
+ regex => 5,
set_number => 0,
},
},
@@ -50,6 +50,14 @@ my %definition_for = (
set_number => 0,
},
},
+ target_r4_filter => {
+ new => 'DeliveryserviceRegex',
+ using => {
+ deliveryservice => 7,
+ regex => 3,
+ set_number => 0,
+ },
+ },
target_r3_filter => {
new => 'DeliveryserviceRegex',
using => {
@@ -58,11 +66,11 @@ my %definition_for = (
set_number => 0,
},
},
- target_r4_filter => {
+ new_steering => {
new => 'DeliveryserviceRegex',
using => {
- deliveryservice => 7,
- regex => 3,
+ deliveryservice => 3,
+ regex => 6,
set_number => 0,
},
},
@@ -114,14 +122,6 @@ my %definition_for = (
set_number => 0,
},
},
- new_steering => {
- new => 'DeliveryserviceRegex',
- using => {
- deliveryservice => 3,
- regex => 6,
- set_number => 0,
- },
- }
);
sub get_definition {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9135384f/traffic_ops/app/lib/Fixtures/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Parameter.pm b/traffic_ops/app/lib/Fixtures/Parameter.pm
index 96f5be8..202a8c4 100644
--- a/traffic_ops/app/lib/Fixtures/Parameter.pm
+++ b/traffic_ops/app/lib/Fixtures/Parameter.pm
@@ -530,7 +530,7 @@ my %definition_for = (
using => {
name => 'maxRevalDurationDays',
config_file => 'regex_revalidate.config',
- value => 3,
+ value => 90,
},
},
## id => 58
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9135384f/traffic_ops/app/t/api/1.1/job.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/job.t b/traffic_ops/app/t/api/1.1/job.t
index 7bd2133..b72f412 100644
--- a/traffic_ops/app/t/api/1.1/job.t
+++ b/traffic_ops/app/t/api/1.1/job.t
@@ -89,7 +89,7 @@ ok $t->post_ok(
ttl => 0,
startTime => $now,
}
- )->status_is(400)->json_is( '/alerts', [ { level => "error", text => "ttl should be between 1 and 72" } ] )
+ )->status_is(400)->json_is( '/alerts', [ { level => "error", text => "ttl should be between 1 and 2160" } ] )
->or( sub { diag $t->tx->res->content->asset->{content}; } ),
'Will not create a purge job without the ttl in the proper low range?';
@@ -98,10 +98,10 @@ ok $t->post_ok(
json => {
dsId => 8,
regex => '/foo1/.*',
- ttl => 1000,
+ ttl => 3000,
startTime => $now,
}
- )->status_is(400)->json_is( '/alerts', [ { level => "error", text => "ttl should be between 1 and 72" } ] )
+ )->status_is(400)->json_is( '/alerts', [ { level => "error", text => "ttl should be between 1 and 2160" } ] )
->or( sub { diag $t->tx->res->content->asset->{content}; } ),
'Will not create a purge job without the ttl in the proper high range?';