From a769edbb0ed7402e2cf8af954efbfce246ee30d6 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Fri, 31 May 2013 02:52:06 +0000 Subject: Fix logon failure string and return test results on failure --- weblog-model.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'weblog-model.lua') diff --git a/weblog-model.lua b/weblog-model.lua index cd515f7..b205c85 100644 --- a/weblog-model.lua +++ b/weblog-model.lua @@ -616,7 +616,7 @@ local connecttosource = function(source, cookiesfile) local resultpage, errtxt = modelfunctions.run_executable({"wget", "-O", "-", "--no-check-certificate", "--save-cookies", cookiesfile, "--keep-session-cookies", "--post-file", cookiesfile, source.method.."://"..source.source.."/cgi-bin/acf/acf-util/logon/logon"}) if resultpage == "" then logme("Failed to connect to "..source.sourcename) - elseif string.find(resultpage, "/acf-util/logon/logon") then + elseif string.find(resultpage, "/acf%-util/logon/logon") then logme("Failed to log on to "..source.sourcename) else success = true @@ -901,11 +901,7 @@ function testsource(self, test) os.remove(cookiesfile) -- fix the result - if test.errtxt then - test.descr = nil - else - test.descr = table.concat(test.descr, "\n") or "" - end + test.descr = table.concat(test.descr, "\n") or "" logme = temp return test -- cgit v1.2.3