Commit 1cc446aa authored by Dave Dykstra's avatar Dave Dykstra
Browse files

allow no proxy url when there is a proxy config url

parent 1f3afdbf
......@@ -84,12 +84,17 @@ else:
site = stag.getAttribute("name")
print "site: " + site
#
# get squid list
# Check for at least one proxy or proxyconfig tag
#
prlist = [x.getAttribute('url') for x in slcdom.getElementsByTagName("proxy")]
if len(prlist) == 0:
print "test_squid.py: Error. no proxy tag in file " + slcfil
sys.exit(same_error)
prcfglist = [x.getAttribute('url') for x in slcdom.getElementsByTagName("proxyconfig")]
if len(prcfglist) == 0:
print "test_frontier.py: Error. no proxy or proxyconfig tag in file " + slcfil
sys.exit(same_error)
print
print "test_frontier.py: only proxyconfig urls defined, skipping squid pings for now"
print
#
# get pure squid site name
#
......
......@@ -209,13 +209,17 @@ print "site: " + site
#
# Work out local FroNtier squid server from site-local-config.xml
#
#
# Check for at least one proxy tag
# Check for at least one proxy or proxyconfig tag
#
prlist = [x.getAttribute('url') for x in slcdom.getElementsByTagName("proxy")]
if len(prlist) == 0:
print "test_squid.py: Error. no proxy tag in file " + slcfil
sys.exit(same_error)
prcfglist = [x.getAttribute('url') for x in slcdom.getElementsByTagName("proxyconfig")]
if len(prcfglist) == 0:
print "test_squid.py: Error. no proxy or proxyconfig tag in file " + slcfil
sys.exit(same_error)
print
print "test_squid.py: only proxyconfig urls defined, ignoring squids for now"
print
#
# Check whether has load balance proxies from site-local-config.xml
#
......@@ -271,7 +275,10 @@ format = "%s?type=frontier_request:1:DEFAULT&encoding=BLOB%s&p1=%s"
queryStart = time.localtime()
print "\nQuery started: " + time.strftime("%m/%d/%y %H:%M:%S %Z", queryStart)
t1 = time.time()
test_result = "Failed"
if len(prlist) == 0:
test_result = "OK"
else:
test_result = "Failed"
ever_failed = "False"
#
for squid in prlist:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment