summaryrefslogtreecommitdiffstats
path: root/qa/config
diff options
context:
space:
mode:
Diffstat (limited to 'qa/config')
-rw-r--r--qa/config/generate_test_data.pl12
-rw-r--r--qa/config/selenium_test.conf2
2 files changed, 12 insertions, 2 deletions
diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl
index 9ba851113..62daef772 100644
--- a/qa/config/generate_test_data.pl
+++ b/qa/config/generate_test_data.pl
@@ -12,6 +12,16 @@
use strict;
use warnings;
+use File::Basename;
+use File::Spec;
+BEGIN {
+ require lib;
+ my $dir = File::Spec->rel2abs(
+ File::Spec->catdir(dirname(__FILE__), "..", "..")
+ );
+ lib->import($dir, File::Spec->catdir($dir, "lib"), File::Spec->catdir($dir, qw(local lib perl5)));
+}
+
use Cwd;
use File::Copy::Recursive qw(dircopy);
@@ -20,7 +30,7 @@ my $config;
BEGIN {
print "reading the config file...\n";
- my $conf_file = "selenium_test.conf";
+ my $conf_file = $ENV{BZ_QA_CONF_FILE} // "selenium_test.conf";
if (@ARGV) {
$conf_file = shift @ARGV;
}
diff --git a/qa/config/selenium_test.conf b/qa/config/selenium_test.conf
index b6a795b78..2a163d5f0 100644
--- a/qa/config/selenium_test.conf
+++ b/qa/config/selenium_test.conf
@@ -16,7 +16,7 @@
'host' => 'localhost',
'port' => 4444,
'browser_url' => 'http://localhost',
- 'attachment_file' => '/var/www/html/bmo/qa/config/patch.diff',
+ 'attachment_file' => 'https://raw.githubusercontent.com/mozilla-bteam/bmo/master/qa/config/patch.diff',
'bugzilla_installation' => 'bmo',
'bugzilla_path' => '/var/www/html/bmo',
'test_bug_1' => 1,