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.7 -r1.8
--- openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	14 May 2007 20:30:18 -0000	1.7
+++ openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	27 Oct 2014 16:39:02 -0000	1.8
@@ -83,7 +83,7 @@
 
     regexp {(:[0-9]*)?$} [util_current_location] match port
 
-    if { [exists_and_not_null port] } {
+    if { ([info exists port] && $port ne "") } {
         return "http://${ip_address}${port}"
     } else {
         return "http://$ip_address"
@@ -193,7 +193,7 @@
     set response_url [tclwebtest::response url]
 
     if { ![string match "*${home_uri}*" $response_url] } {
-        if { [empty_string_p [cc_lookup_email_user $email]] } {
+        if { [cc_lookup_email_user $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]"