- Fix failing CI tests due to recent login/email changes

diff --git a/xt/config/checksetup_answers.txt b/xt/config/checksetup_answers.txt
index 29a1563d6461b7abb6f0f640c26b92871ec6b86d..77484c7771244567b95391798e93d40cf8ebd34b 100644 (file)
--- a/xt/config/checksetup_answers.txt
+++ b/xt/config/checksetup_answers.txt
@@ -11,6 +11,7 @@
  $answer{'db_mysql_ssl_client_cert'} = '';
  $answer{'db_mysql_ssl_client_key'} = '';
  $answer{'urlbase'} = 'http://localhost/bugzilla/';
+ $answer{'use_email_as_login'} = 1;
  $answer{'create_htaccess'} = '';
  $answer{'use_suexec'} = '';
  $answer{'index_html'} = 0;

diff --git a/xt/config/generate_test_data.pl b/xt/config/generate_test_data.pl
index ce065998b8cfad3e791baefcab4193be57c123ee..c3e8537c8d5333ee9775c78dfd7ba39c499d2a45 100755 (executable)
--- a/xt/config/generate_test_data.pl
+++ b/xt/config/generate_test_data.pl
@@ -137,7 +137,7 @@ foreach my $username (@usernames) {
     $login ||= $config->{"${prefix}_user_login"};
     my $api_key = $config->{"${prefix}_user_api_key"};
 
-    if (is_available_username($login)) {
+    if (is_available_email($login)) {
         my %extra_args;
         if ($username eq 'disabled') {
             $extra_args{disabledtext} = '!!This is the text!!';