GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Unverified Commit e4c41305 authored by boklm's avatar boklm
Browse files

Bug 26981: update marionette_harness and marionette_driver

parent 348ad855
......@@ -2,7 +2,7 @@
*.pyc
clones
virtualenv
virtualenv-marionette
virtualenv-marionette-4.3.0
reports
tmp
bundle
......@@ -826,7 +826,7 @@ sub marionette_run {
$test->{screenshots} = [];
my $screenshots_tmp = File::Temp::newdir('XXXXXX', DIR => $options->{tmpdir});
$ENV{'MARIONETTE_SCREENSHOTS'} = winpath($screenshots_tmp);
system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-4.0.0/$bin/tor-browser-tests",
system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-4.3.0/$bin/tor-browser-tests",
'--log-unittest', winpath($result_file_txt),
'--log-html', winpath($result_file_html),
'--binary', ffbin_path($tbbinfos, $test),
......
......@@ -3,11 +3,11 @@ from setuptools import setup, find_packages
PACKAGE_VERSION = '0.3'
deps = [
'marionette_harness == 4.0.0',
'marionette_driver == 2.2.0',
'marionette_harness == 4.3.0',
'marionette_driver == 2.5.0',
'mozfile == 1.2',
'mozinfo == 0.9',
'mozlog == 3.4',
'mozinfo == 0.8',
'mozlog == 3.0',
]
setup(name='tor-browser-tests',
......
......@@ -13,7 +13,7 @@ sub winpath {
return $res;
}
my $virtenv_marionette_dir = winpath("$FindBin::Bin/virtualenv-marionette-4.0.0");
my $virtenv_marionette_dir = winpath("$FindBin::Bin/virtualenv-marionette-4.3.0");
my $virtenv_pefile_dir = winpath("$FindBin::Bin/virtualenv-pefile");
sub run {
......@@ -41,9 +41,12 @@ if ($OSNAME eq 'cygwin') {
unless (-d $virtenv_marionette_dir) {
run($virtualenv_cmd, $virtenv_marionette_dir);
# upgrade pip and setuptools
run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'pip');
run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'setuptools');
run_from_dir('marionette', "$virtenv_marionette_dir/$bin/python", 'setup.py', 'develop');
# Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1345274
my $sitepackage = 'site-packages/marionette_harness-4.0.0-py2.7.egg/marionette_harness/runner/';
my $sitepackage = 'site-packages/marionette_harness-4.3.0-py2.7.egg/marionette_harness/runner/';
my $marionette_runner_dir = "$virtenv_marionette_dir/$lib/python2.7/$sitepackage";
$marionette_runner_dir = "$virtenv_marionette_dir/$lib/$sitepackage"
unless -d $marionette_runner_dir;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment