From: David Lawrence <dkl@mozilla.com>
Date: Tue, 23 Aug 2016 21:07:12 +0000 (-0400)
Subject: - Fix failing CI tests due to recent login/email changes
X-Git-Tag: release-5.1.2~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be3d5a23267bb7466c56af6c5d683760d33d5c7a;p=thirdparty%2Fbugzilla.git

- 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 29a1563d64..77484c7771 100644
--- 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 ce065998b8..c3e8537c8d 100755
--- 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!!';