diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-12-16 20:17:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 20:17:05 +0100 |
| commit | 334bead74bc9c5e819f14946726eaad40986d636 (patch) | |
| tree | e7ecf8d4eba2e6a046da8a9dc8828f35b75c7428 /qa/config | |
| parent | 49e0df0d4e1b2f25be4ab36660dac5e47768c9a1 (diff) | |
| download | bugzilla-334bead74bc9c5e819f14946726eaad40986d636.tar.gz bugzilla-334bead74bc9c5e819f14946726eaad40986d636.tar.xz | |
Bug 1403777 - Migrate urlbase from params to localconfig
Diffstat (limited to 'qa/config')
| -rw-r--r-- | qa/config/checksetup_answers.txt | 1 | ||||
| -rw-r--r-- | qa/config/generate_test_data.pl | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/qa/config/checksetup_answers.txt b/qa/config/checksetup_answers.txt index f9fb6ea60..79d9cb90c 100644 --- a/qa/config/checksetup_answers.txt +++ b/qa/config/checksetup_answers.txt @@ -22,6 +22,5 @@ $answer{'db_user'} = 'bugs'; $answer{'diffpath'} = '/usr/bin'; $answer{'index_html'} = 0; $answer{'interdiffbin'} = '/usr/bin/interdiff'; -$answer{'urlbase'} = 'http://localhost/bmo/'; $answer{'use_suexec'} = ''; $answer{'webservergroup'} = '%USER%'; diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl index 333bffa26..6bd9dd355 100644 --- a/qa/config/generate_test_data.pl +++ b/qa/config/generate_test_data.pl @@ -67,17 +67,6 @@ Bugzilla->usage_mode(USAGE_MODE_CMDLINE); # Set Parameters ########################################################################## -# Some parameters must be turned on to create bugs requiring them. -# They are also expected to be turned on by some webservice_*.t scripts. -my ($urlbase, $sslbase); -$urlbase = $config->{browser_url} . '/' . $config->{bugzilla_installation}; -$urlbase .= '/' unless $urlbase =~ /\/$/; - -if ($urlbase =~ /^https/) { - $sslbase = $urlbase; - $urlbase =~ s/^https(.+)$/http$1/; -} - # Create missing priorities # BMO uses P1-P5 which is different from upstream my $field = Bugzilla::Field->new({ name => 'priority' }); @@ -98,8 +87,6 @@ foreach my $value (qw(PC)) { } my %set_params = ( - urlbase => $urlbase, - sslbase => $sslbase, usebugaliases => 1, useqacontact => 1, mail_delivery_method => 'Test', |