You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/05/19 12:38:14 UTC
[1/3] incubator-trafficcontrol git commit: Order of second thing is
still arbitrary
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/2.0.x 43dfd8333 -> 2978c6571
Order of second thing is still arbitrary
(cherry picked from commit 89e64ecb1bcc1dfc7df08162088394b73e6766b3)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/60ac0ca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/60ac0ca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/60ac0ca8
Branch: refs/heads/2.0.x
Commit: 60ac0ca893830dba6ef5c02d93d02596f6ecd8be
Parents: df4f10c
Author: Jan van Doorn <jv...@apache.org>
Authored: Mon Feb 27 14:52:01 2017 +0000
Committer: Eric Friedrich <fr...@apache.org>
Committed: Fri May 19 08:37:23 2017 -0400
----------------------------------------------------------------------
traffic_ops/app/t/api/1.1/cachegroupparameter.t | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60ac0ca8/traffic_ops/app/t/api/1.1/cachegroupparameter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/cachegroupparameter.t b/traffic_ops/app/t/api/1.1/cachegroupparameter.t
index 805cad6..5be49f1 100644
--- a/traffic_ops/app/t/api/1.1/cachegroupparameter.t
+++ b/traffic_ops/app/t/api/1.1/cachegroupparameter.t
@@ -43,10 +43,10 @@ ok $t->post_ok( '/login', => form => { u => 'portal', p => Test::TestHelper::ADM
->or( sub { diag $t->tx->res->content->asset->{content}; } );
$t->get_ok("/api/1.1/cachegroupparameters.json")->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( '/response/cachegroupParameters/0/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/0/parameter', "61" )
- ->json_is( '/response/cachegroupParameters/1/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/1/parameter', "60" )
- ->json_is( '/response/cachegroupParameters/2/cachegroup', 'mid-northwest-group' )->json_is( '/response/cachegroupParameters/2/parameter', "61" )
- ->json_is( '/response/cachegroupParameters/3/cachegroup', 'mid-northwest-group' )->json_is( '/response/cachegroupParameters/3/parameter', "60" );
+ ->json_is( '/response/cachegroupParameters/0/cachegroup', 'mid-northeast-group' )->json_like( '/response/cachegroupParameters/0/parameter', qr/\d+/ )
+ ->json_is( '/response/cachegroupParameters/1/cachegroup', 'mid-northeast-group' )->json_like( '/response/cachegroupParameters/1/parameter', qr/\d+/ )
+ ->json_is( '/response/cachegroupParameters/2/cachegroup', 'mid-northwest-group' )->json_like( '/response/cachegroupParameters/2/parameter', qr/\d+/ )
+ ->json_is( '/response/cachegroupParameters/3/cachegroup', 'mid-northwest-group' )->json_like( '/response/cachegroupParameters/3/parameter', qr/\d+/ );
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();
[2/3] incubator-trafficcontrol git commit: [TC-167] fix old test;
not sure how it ever worked.
Posted by fr...@apache.org.
[TC-167] fix old test; not sure how it ever worked.
(cherry picked from commit aa01b7c0f5563164e0f864a5e3009db42d3ca425)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/df4f10cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/df4f10cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/df4f10cb
Branch: refs/heads/2.0.x
Commit: df4f10cbea167d4edea124485ea7930029078779
Parents: 43dfd83
Author: Jan van Doorn <jv...@apache.org>
Authored: Sat Feb 25 22:16:42 2017 +0000
Committer: Eric Friedrich <fr...@apache.org>
Committed: Fri May 19 08:37:23 2017 -0400
----------------------------------------------------------------------
traffic_ops/app/t/api/1.1/cachegroupparameter.t | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df4f10cb/traffic_ops/app/t/api/1.1/cachegroupparameter.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/cachegroupparameter.t b/traffic_ops/app/t/api/1.1/cachegroupparameter.t
index 504f15b..805cad6 100644
--- a/traffic_ops/app/t/api/1.1/cachegroupparameter.t
+++ b/traffic_ops/app/t/api/1.1/cachegroupparameter.t
@@ -43,11 +43,11 @@ ok $t->post_ok( '/login', => form => { u => 'portal', p => Test::TestHelper::ADM
->or( sub { diag $t->tx->res->content->asset->{content}; } );
$t->get_ok("/api/1.1/cachegroupparameters.json")->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( '/response/cachegroupParameters/0/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/0/parameter', "60" )
- ->json_is( '/response/cachegroupParameters/1/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/0/parameter', "60" )
- ->json_is( '/response/cachegroupParameters/1/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/1/parameter', "61" )
- ->json_is( '/response/cachegroupParameters/2/cachegroup', 'mid-northwest-group' )->json_is( '/response/cachegroupParameters/2/parameter', "60" );
+ ->json_is( '/response/cachegroupParameters/0/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/0/parameter', "61" )
+ ->json_is( '/response/cachegroupParameters/1/cachegroup', 'mid-northeast-group' )->json_is( '/response/cachegroupParameters/1/parameter', "60" )
+ ->json_is( '/response/cachegroupParameters/2/cachegroup', 'mid-northwest-group' )->json_is( '/response/cachegroupParameters/2/parameter', "61" )
+ ->json_is( '/response/cachegroupParameters/3/cachegroup', 'mid-northwest-group' )->json_is( '/response/cachegroupParameters/3/parameter', "60" );
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();
-done_testing();
\ No newline at end of file
+done_testing();
[3/3] incubator-trafficcontrol git commit: This closes #532
Posted by fr...@apache.org.
This closes #532
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2978c657
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2978c657
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2978c657
Branch: refs/heads/2.0.x
Commit: 2978c6571b93b801cd137c4b53920f554813ce90
Parents: 60ac0ca
Author: Eric Friedrich <fr...@apache.org>
Authored: Fri May 19 08:37:33 2017 -0400
Committer: Eric Friedrich <fr...@apache.org>
Committed: Fri May 19 08:37:33 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------