Index: openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	27 Oct 2014 16:39:02 -0000	1.8
+++ openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	7 Aug 2017 23:47:46 -0000	1.9
@@ -53,12 +53,11 @@
     }
 
     if { $error_p } {
-        # Either some non-socket error, or a socket problem occuring with more than
+        # Either some non-socket error, or a socket problem occurring with more than
         # $retry_max times. Propagate the error while retaining the stack trace
         aa_log "twt::do_request failed with error=\"$errmsg\" response_url=\"[tclwebtest::response url]\". See error log for the HTML response body"
         ns_log Error "twt::do_request failed with error=\"$errmsg\" response_url=\"[tclwebtest::response url]\" response_body=\"[tclwebtest::response body]\""
-        global errorInfo
-        error $errmsg $errorInfo
+        error $errmsg $::errorInfo
     }
 }
 
@@ -193,11 +192,11 @@
     set response_url [tclwebtest::response url]
 
     if { ![string match "*${home_uri}*" $response_url] } {
-        if { [cc_lookup_email_user $email] eq "" } {
+        if { [party::get_by_email -email $email] eq "" } {
             error "Failed to login user with email=\"$email\" and password=\"$password\". No user with such email in database."
         } else {
-            ns_log Error "Failed to log in user with email=\"$email\" and password=\"$password\" eventhough email exists (password may be incorrect). response_body=[tclwebtest::response body]"
-            error "Failed to log in user with email=\"$email\" and password=\"$password\" eventhough email exists (password may be incorrect). User should be able to request $home_uri without redirection, however response url=$response_url"
+            ns_log Error "Failed to log in user with email=\"$email\" and password=\"$password\" even though email exists (password may be incorrect). response_body=[tclwebtest::response body]"
+            error "Failed to log in user with email=\"$email\" and password=\"$password\" even though email exists (password may be incorrect). User should be able to request $home_uri without redirection, however response url=$response_url"
 
         }
     }
@@ -208,3 +207,9 @@
 } {
     twt::do_request "[twt::server_url]/register/logout"
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: