This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 925cde0cd54893b134d099784e9aff575a4451fb
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Tue May 1 15:30:16 2018 -0600
updated golang tests with anonymous_blocking_enabled field
---
traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go | 7 ++++---
traffic_ops/traffic_ops_golang/deliveryservice/handlers_test.go | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go
b/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go
index b5795e2..eede045 100644
--- a/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go
+++ b/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go
@@ -81,6 +81,7 @@ func randDS() tc.CRConfigDeliveryService {
ttlSOA := "86400"
geoProviderStr := GeoProviderMaxmindStr
return tc.CRConfigDeliveryService{
+ AnonymousBlockingEnabled: &falseStrPtr,
CoverageZoneOnly: false,
Dispersion: &tc.CRConfigDispersion{
Limit: 42,
@@ -151,12 +152,12 @@ func ExpectedMakeDSes()
map[string]tc.CRConfigDeliveryService {
}
func MockMakeDSes(mock sqlmock.Sqlmock, expected
map[string]tc.CRConfigDeliveryService, cdn string) {
- // select d.xml_id, d.miss_lat, d.miss_long, d.protocol, d.ccr_dns_ttl
as ttl, d.routing_name, d.geo_provider, t.name as type, d.geo_limit,
d.geo_limit_countries, d.geolimit_redirect_url, d.initial_dispersion,
d.regional_geo_blocking, d.tr_response_headers, d.max_dns_answers, p.name as
profile, d.dns_bypass_ip, d.dns_bypass_ip6, d.dns_bypass_ttl,
d.dns_bypass_cname, d.http_bypass_fqdn, d.ipv6_routing_enabled,
d.deep_caching_type, d.tr_request_headers, d.tr_response_headers
+ // select d.xml_id, d.miss_lat, d.miss_long, d.protocol, d.ccr_dns_ttl
as ttl, d.routing_name, d.geo_provider, t.name as type, d.geo_limit,
d.geo_limit_countries, d.geolimit_redirect_url, d.initial_dispersion,
d.regional_geo_blocking, d.tr_response_headers, d.max_dns_answers, p.name as
profile, d.dns_bypass_ip, d.dns_bypass_ip6, d.dns_bypass_ttl,
d.dns_bypass_cname, d.http_bypass_fqdn, d.ipv6_routing_enabled,
d.deep_caching_type, d.tr_request_headers, d.tr_response_headers, d.anonymous_
[...]
- rows := sqlmock.NewRows([]string{"xml_id", "miss_lat", "miss_long",
"protocol", "ttl", "routing_name", "geo_provider", "type", "geo_limit",
"geo_limit_countries", "geeo_limit_redirect_url", "initial_dispersion",
"regional_geo_blocking", "tr_response_headers", "max_dns_answers", "profile",
"dns_bypass_ip", "dns_bypass_ip6", "dns_bypass_ttl", "dns_bypass_cname",
"http_bypass_fqdn", "ipv6_routing_enabled", "deep_caching_type",
"tr_request_headers", "tr_response_headers"})
+ rows := sqlmock.NewRows([]string{"xml_id", "miss_lat", "miss_long",
"protocol", "ttl", "routing_name", "geo_provider", "type", "geo_limit",
"geo_limit_countries", "geeo_limit_redirect_url", "initial_dispersion",
"regional_geo_blocking", "tr_response_headers", "max_dns_answers", "profile",
"dns_bypass_ip", "dns_bypass_ip6", "dns_bypass_ttl", "dns_bypass_cname",
"http_bypass_fqdn", "ipv6_routing_enabled", "deep_caching_type",
"tr_request_headers", "tr_response_headers", "anonymous_blockin [...]
for dsName, ds := range expected {
- rows = rows.AddRow(dsName, ds.MissLocation.Lat,
ds.MissLocation.Lon, 0, *ds.TTL, *ds.RoutingName, 0, "HTTP", 0, "", "", 42,
false, "", nil, "", "", "", 0, "", *ds.BypassDestination["HTTP"].FQDN,
*ds.IP6RoutingEnabled, nil, "", "")
+ rows = rows.AddRow(dsName, ds.MissLocation.Lat,
ds.MissLocation.Lon, 0, *ds.TTL, *ds.RoutingName, 0, "HTTP", 0, "", "", 42,
false, "", nil, "", "", "", 0, "", *ds.BypassDestination["HTTP"].FQDN,
*ds.IP6RoutingEnabled, nil, "", "", false)
}
mock.ExpectQuery("select").WithArgs(cdn).WillReturnRows(rows)
}
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/handlers_test.go
b/traffic_ops/traffic_ops_golang/deliveryservice/handlers_test.go
index 304365b..36be42a 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/handlers_test.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/handlers_test.go
@@ -45,6 +45,7 @@ func TestValidateErrors(t *testing.T) {
expected := []string{
"'active' is required",
+ "'anonymousBlockingEnabled' is required",
"'cdnId' cannot be blank",
"'displayName' the length must be between 1 and 48",
"'dscp' is required",
--
To stop receiving notification emails like this one, please contact
els...@apache.org.
