Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -N -r1.79.2.26 -r1.79.2.27
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	3 Feb 2020 18:11:04 -0000	1.79.2.26
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	26 Feb 2020 12:41:30 -0000	1.79.2.27
@@ -1454,7 +1454,7 @@
         if {!$already_logged_in} {
             #
             # The user is not logged in via cookies, check first
-            # available user_id. If this dies not exist, perform login
+            # available user_id. If this does not exist, perform login
             #
             #aa_log "not logged in, check $user_info"
 
@@ -1464,10 +1464,17 @@
                 set user_id [dict get $user_info user_id]
                 if {$user_id ne 0} {
                     #aa_log "::acs::test::set_user set logindata via nsv"
+                    set address [dict get $user_info address]
+                    ad_try {
+                        set peeraddr [ns_addrbyhost $address]
+                    } on error {errorMsg} {
+                        set peeraddr $address
+                    }
+                    set address $peeraddr
                     nsv_set aa_test logindata \
                         [list \
-                             peeraddr [dict get $user_info address] \
-                             user_id [dict get $user_info user_id]]
+                             peeraddr $address \
+                             user_id $user_id]
                     dict set session login via_logindata
                 } else {
                     dict set session login none