You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/04/14 19:36:01 UTC
[1/2] incubator-trafficcontrol git commit: This closes #472
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 1ce970fb9 -> caa13ee29
This closes #472
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/caa13ee2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/caa13ee2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/caa13ee2
Branch: refs/heads/master
Commit: caa13ee299923f9e822d5eb2e5c8852155eea4e0
Parents: dd7b2f3
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri Apr 14 13:35:46 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Fri Apr 14 13:35:46 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/2] incubator-trafficcontrol git commit: fixes failing tests.
ambiguous fields need table qualifiers.
Posted by de...@apache.org.
fixes failing tests. ambiguous fields need table qualifiers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dd7b2f37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dd7b2f37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dd7b2f37
Branch: refs/heads/master
Commit: dd7b2f370ebe670fcdf9c7d9067d0c4b8bce0188
Parents: 1ce970f
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri Apr 14 13:33:49 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Fri Apr 14 13:35:46 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/t/purge.t | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dd7b2f37/traffic_ops/app/t/purge.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/purge.t b/traffic_ops/app/t/purge.t
index 15e8084..97286e6 100644
--- a/traffic_ops/app/t/purge.t
+++ b/traffic_ops/app/t/purge.t
@@ -48,8 +48,8 @@ $t->post_ok( '/login', => form => { u => 'admin', p => 'password' } )->status_is
my $q = "SELECT deliveryservice.id,
deliveryservice.xml_id,
- org_server_fqdn,
- type,
+ deliveryservice.org_server_fqdn,
+ deliveryservice.type,
profile.id AS profile_id,
cdn.name AS cdn_name
FROM deliveryservice
@@ -69,14 +69,14 @@ my $cdn_name = $ds->{cdn_name};
my $ds_name = $ds->{xml_id};
diag "Testing " . $ds_name . " (" . $host . ") in " . $cdn_name;
-$q = 'SELECT DISTINCT host_name,
+$q = 'SELECT DISTINCT server.host_name,
cdn.name as cdn_name
FROM server
JOIN profile ON profile.id = server.profile
JOIN cdn ON cdn.id = server.cdn_id
WHERE cdn.name!=\'' . $cdn_name . '\'
- and type in (select id from type where name =\'EDGE\' or name =\'MID\')
- and status in (select id from status where name =\'REPORTED\' or name =\'ONLINE\')';
+ and server.type in (select id from type where name =\'EDGE\' or name =\'MID\')
+ and server.status in (select id from status where name =\'REPORTED\' or name =\'ONLINE\')';
my $get_servers = $dbh->prepare($q);
$get_servers->execute();
@@ -93,11 +93,11 @@ while ( defined( $p->[$j] ) ) {
diag "Other servers " . $j;
# get all edges assicated with this cdn name
-$q = 'SELECT DISTINCT host_name FROM server
+$q = 'SELECT DISTINCT server.host_name FROM server
JOIN profile ON profile.id = server.profile
JOIN cdn ON cdn.id = server.cdn_id
-WHERE cdn.name=\'' . $cdn_name . '\' and type in (select id from type where name =\'EDGE\' or name =\'MID\')
-and status in (select id from status where name =\'REPORTED\' or name =\'ONLINE\')';
+WHERE cdn.name=\'' . $cdn_name . '\' and server.type in (select id from type where name =\'EDGE\' or name =\'MID\')
+and server.status in (select id from status where name =\'REPORTED\' or name =\'ONLINE\')';
# diag $q ;
$get_servers = $dbh->prepare($q);
@@ -246,3 +246,5 @@ foreach my $cache ( keys %{$slist} ) {
}
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();
+done_testing();
+