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 2017/08/04 23:16:31 UTC
[1/2] incubator-trafficcontrol git commit: switch json_is asserts
that relied on ordering to content_like asserts
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master ad2feb7fe -> 47595628c
switch json_is asserts that relied on ordering to content_like asserts
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a6ad02a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a6ad02a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a6ad02a1
Branch: refs/heads/master
Commit: a6ad02a10cc11e7100ffa9a3ab7ff21202a4578c
Parents: ad2feb7
Author: Dylan Volz <Dy...@comcast.com>
Authored: Fri Aug 4 15:53:33 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Aug 4 17:15:54 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/t/api/1.2/server.t | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6ad02a1/traffic_ops/app/t/api/1.2/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/server.t b/traffic_ops/app/t/api/1.2/server.t
index 5591cb6..1ce14c5 100644
--- a/traffic_ops/app/t/api/1.2/server.t
+++ b/traffic_ops/app/t/api/1.2/server.t
@@ -78,28 +78,28 @@ ok $t->post_ok('/api/1.2/cachegroups' => {Accept => 'application/json'} => json
, 'Does the cache group details return?';
ok $t->get_ok('/api/1.2/servers?type=MID')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/hostName", "atlanta-mid-01" )
- ->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
- ->json_is( "/response/0/type", "MID" )
+ ->content_like( "/atlanta\-mid\-01/" )
+ ->content_like("/ga\.atlanta\.kabletown\.net/" )
+ ->content_like("/MID/" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->get_ok('/api/1.2/servers?cdn=100')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/hostName", "atlanta-edge-01" )
- ->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
- ->json_is( "/response/0/cdnId", 100 )
+ ->content_like( "/atlanta\-edge\-01/" )
+ ->content_like( "/ga\.atlanta\.kabletown\.net/" )
+ ->content_like( "/100/" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->get_ok('/api/1.2/servers?cachegroup=200')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/hostName", "atlanta-mid-02" )
- ->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
- ->json_is( "/response/0/cachegroupId", 200 )
+ ->content_like( "/atlanta\-mid\-02/" )
+ ->content_like( "/ga\.atlanta\.kabletown\.net/" )
+ ->content_like( "/200/" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->get_ok('/api/1.2/servers?type=MID&status=ONLINE')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/hostName", "atlanta-mid-01" )
- ->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
- ->json_is( "/response/0/type", "MID" )
- ->json_is( "/response/0/status", "ONLINE" )
+ ->content_like( "/atlanta\-mid\-01/" )
+ ->content_like( "/ga\.atlanta\.kabletown\.net/" )
+ ->content_like( "/MID/" )
+ ->content_like( "/ONLINE/" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->post_ok('/api/1.2/cachegroups' => {Accept => 'application/json'} => json => {
[2/2] incubator-trafficcontrol git commit: This closes #779.
Posted by da...@apache.org.
This closes #779.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/47595628
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/47595628
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/47595628
Branch: refs/heads/master
Commit: 47595628ce80ce1c75183aaef51c5b66d6908ce9
Parents: a6ad02a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Aug 4 17:16:20 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Aug 4 17:16:20 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------