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.12 -r1.79.2.13
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	11 Jun 2019 19:00:23 -0000	1.79.2.12
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	18 Jun 2019 13:05:11 -0000	1.79.2.13
@@ -1903,7 +1903,6 @@
         {-password ""}
         {-user_id ""}
     } {
-        
         Create a test user with random email and password for testing.
         If an email is passed in and the party identified by the
         password exists, the user_id of this party is returned in the
@@ -1918,9 +1917,7 @@
         @return The user_info dict returned by auth::create_user. Contains
                 the additional keys email and password.
     } {
-        if {$email eq ""} {
-            set email       "$username@test.test"
-        } else {
+        if {$email ne ""} {
             set party_info [party::get -email $email]
             if {[llength $party_info] > 0} {
                 #
@@ -1935,6 +1932,7 @@
             set password    [ad_generate_random_string]
         }
         set username    "__test_user_[ad_generate_random_string]"
+        set email       "$username@test.test"
         set first_names [ad_generate_random_string]
         set last_name   [ad_generate_random_string]