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.15.2.2 -r1.15.2.3
--- openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	2 Sep 2021 16:40:49 -0000	1.15.2.2
+++ openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	9 Sep 2022 11:39:24 -0000	1.15.2.3
@@ -24,7 +24,7 @@
 
     # Qualify page_url if necessary
     if { [regexp {^/} $page_url] } {
-        set page_url "[twt::server_url]${page_url}"
+        set page_url [acs::test::url]${page_url}
     }
 
     set retry_count 0
@@ -67,11 +67,16 @@
     ns_log Notice "twt::log - $message"
 }
 
-ad_proc twt::server_url {} {
+ad_proc -deprecated twt::server_url {} {
     Get the URL of the server (like ad_url) using the IP number of the server.
     Is more bulletproof than using the domain name.
 
     @author Peter Marklund
+
+    DEPRECATED: a more reliable api is now available that also allows
+    to override it via parameter.
+
+    @see acs::test::url
 } {
     set ip_address [ns_config ns/server/[ns_info server]/module/nssock Address]
 
@@ -132,7 +137,7 @@
     tclwebtest::cookies clear
 
     # Request the start page
-    ::twt::do_request "[twt::server_url]/register"
+    ::twt::do_request [acs::test::url]/register
 
     # Login the user
     tclwebtest::form find ~n login
@@ -174,7 +179,7 @@
 ad_proc twt::user::logout {} {
     tclwebtest for logging the user out.
 } {
-    twt::do_request "[twt::server_url]/register/logout"
+    twt::do_request [acs::test::url]/register/logout
 }
 
 # Local variables:
Index: openacs-4/packages/acs-core-docs/www/tutorial-debug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-debug.adp,v
diff -u -N -r1.4.2.9 -r1.4.2.10
--- openacs-4/packages/acs-core-docs/www/tutorial-debug.adp	27 Apr 2022 16:52:20 -0000	1.4.2.9
+++ openacs-4/packages/acs-core-docs/www/tutorial-debug.adp	9 Sep 2022 11:39:24 -0000	1.4.2.10
@@ -243,8 +243,8 @@
             # Request note-edit page
             set package_uri [apm_package_url_from_key myfirstpackage]
             set edit_uri "${package_uri}note-edit"
-            aa_log "[twt::server_url]$edit_uri"
-            twt::do_request "[twt::server_url]$edit_uri"
+            aa_log [acs::test::url]$edit_uri
+            twt::do_request [acs::test::url]$edit_uri
             
             # Submit a new note
 
@@ -312,4 +312,4 @@
 Topics"
 			homeLink="index" homeLabel="Home" 
 			upLink="tutorial" upLabel="Up"> 
-		    
\ No newline at end of file
+		    
Index: openacs-4/packages/acs-core-docs/www/tutorial-debug.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-debug.html,v
diff -u -N -r1.46.2.6 -r1.46.2.7
--- openacs-4/packages/acs-core-docs/www/tutorial-debug.html	15 Sep 2021 16:11:42 -0000	1.46.2.6
+++ openacs-4/packages/acs-core-docs/www/tutorial-debug.html	9 Sep 2022 11:39:24 -0000	1.46.2.7
@@ -161,8 +161,8 @@
             # Request note-edit page
             set package_uri [apm_package_url_from_key myfirstpackage]
             set edit_uri "${package_uri}note-edit"
-            aa_log "[twt::server_url]$edit_uri"
-            twt::do_request "[twt::server_url]$edit_uri"
+            aa_log [acs::test::url]$edit_uri
+            twt::do_request [acs::test::url]$edit_uri"
             
             # Submit a new note
 
Index: openacs-4/packages/acs-core-docs/www/files/tutorial/myfirstpackage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/files/tutorial/myfirstpackage-procs.tcl,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-core-docs/www/files/tutorial/myfirstpackage-procs.tcl	22 Jul 2018 10:15:49 -0000	1.10
+++ openacs-4/packages/acs-core-docs/www/files/tutorial/myfirstpackage-procs.tcl	9 Sep 2022 11:39:24 -0000	1.10.2.1
@@ -91,8 +91,8 @@
             # Request note-edit page
             set package_uri [apm_package_url_from_key myfirstpackage]
             set edit_uri "${package_uri}note-edit"
-            aa_log "[twt::server_url]$edit_uri"
-            twt::do_request "[twt::server_url]$edit_uri"
+            aa_log [acs::test::url]$edit_uri
+            twt::do_request [acs::test::url]$edit_uri
             
             # Submit a new note