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 51431cd2 authored by boklm's avatar boklm
Browse files

Bug 21981: update marionette version for ESR52 switch

parent 0dd82d8a
......@@ -829,7 +829,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/$bin/tor-browser-tests",
system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-4.0.0/$bin/tor-browser-tests",
'--log-unittest', winpath($result_file_txt),
'--log-html', winpath($result_file_html),
'--binary', ffbin_path($tbbinfos, $test),
......
Certificate:
Data:
Version: 3 (0x2)
Serial Number: 2 (0x2)
Signature Algorithm: sha256WithRSAEncryption
Issuer: CN=web-platform-tests
Validity
Not Before: Dec 22 12:09:16 2014 GMT
Not After : Dec 21 12:09:16 2024 GMT
Subject: CN=web-platform.test
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
Public-Key: (2048 bit)
Modulus:
00:b3:84:d6:8b:01:59:18:85:d1:dc:32:df:38:f7:
90:85:1b:3e:a5:5e:81:3e:2f:fc:3a:5f:7f:77:ef:
23:bb:3a:88:27:0f:be:25:46:cd:63:7d:cb:95:d8:
a5:50:10:d2:a2:d2:b7:97:d1:0d:6c:fb:f9:05:e8:
6f:a8:4b:bd:95:67:9e:7b:94:58:a9:6d:93:fd:e0:
12:c5:cd:b4:8a:64:52:31:5f:0e:e3:89:84:71:da:
98:dd:4b:ec:02:25:a5:7d:35:fe:63:da:b3:ac:ec:
a5:46:0f:0d:64:23:5c:6d:f3:ec:cc:28:63:23:c0:
4b:9a:ec:8f:c1:ee:b1:a2:3e:72:4d:70:b5:09:c1:
eb:b4:10:55:3c:8b:ea:1b:94:7e:4b:74:e6:f4:9f:
4f:a6:45:30:b5:f0:b8:b4:d1:59:50:65:0a:86:53:
ea:4c:9f:9e:f4:58:6c:31:f5:17:3a:6f:57:8b:cb:
5f:f0:28:0b:45:92:8d:30:20:49:ff:52:e6:2c:cb:
18:9a:d7:e6:ee:3e:4f:34:35:15:13:c5:02:da:c5:
5f:be:fb:5b:ce:8d:bf:b5:35:76:3c:7c:e6:9c:3b:
26:87:4d:8d:80:e6:16:c6:27:f2:50:49:b6:72:74:
43:49:49:44:38:bb:78:43:23:ee:16:3e:d9:62:e6:
a5:d7
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Basic Constraints:
CA:FALSE
X509v3 Subject Key Identifier:
2D:98:A3:99:39:1C:FE:E9:9A:6D:17:94:D2:3A:96:EE:C8:9E:04:22
X509v3 Authority Key Identifier:
keyid:6A:AB:53:64:92:36:87:23:34:B3:1D:6F:85:4B:F5:DF:5A:5C:74:8F
X509v3 Key Usage:
Digital Signature, Non Repudiation, Key Encipherment
X509v3 Extended Key Usage:
TLS Web Server Authentication
X509v3 Subject Alternative Name:
DNS:web-platform.test, DNS:www.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www2.web-platform.test, DNS:www1.web-platform.test
Signature Algorithm: sha256WithRSAEncryption
33:db:f7:f0:f6:92:16:4f:2d:42:bc:b8:aa:e6:ab:5e:f9:b9:
b0:48:ae:b5:8d:cc:02:7b:e9:6f:4e:75:f7:17:a0:5e:7b:87:
06:49:48:83:c5:bb:ca:95:07:37:0e:5d:e3:97:de:9e:0c:a4:
82:30:11:81:49:5d:50:29:72:92:a5:ca:17:b1:7c:f1:32:11:
17:57:e6:59:c1:ac:e3:3b:26:d2:94:97:50:6a:b9:54:88:84:
9b:6f:b1:06:f5:80:04:22:10:14:b1:f5:97:25:fc:66:d6:69:
a3:36:08:85:23:ff:8e:3c:2b:e0:6d:e7:61:f1:00:8f:61:3d:
b0:87:ad:72:21:f6:f0:cc:4f:c9:20:bf:83:11:0f:21:f4:b8:
c0:dd:9c:51:d7:bb:27:32:ec:ab:a4:62:14:28:32:da:f2:87:
80:68:9c:ea:ac:eb:f5:7f:f5:de:f4:c0:39:91:c8:76:a4:ee:
d0:a8:50:db:c1:4b:f9:c4:3d:d9:e8:8e:b6:3f:c0:96:79:12:
d8:fa:4d:0a:b3:36:76:aa:4e:b2:82:2f:a2:d4:0d:db:fd:64:
77:6f:6e:e9:94:7f:0f:c8:3a:3c:96:3d:cd:4d:6c:ba:66:95:
f7:b4:9d:a4:94:9f:97:b3:9a:0d:dc:18:8c:11:0b:56:65:8e:
46:4c:e6:5e
-----BEGIN CERTIFICATE-----
MIID2jCCAsKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJ3ZWIt
cGxhdGZvcm0tdGVzdHMwHhcNMTQxMjIyMTIwOTE2WhcNMjQxMjIxMTIwOTE2WjAc
MRowGAYDVQQDExF3ZWItcGxhdGZvcm0udGVzdDCCASIwDQYJKoZIhvcNAQEBBQAD
ggEPADCCAQoCggEBALOE1osBWRiF0dwy3zj3kIUbPqVegT4v/Dpff3fvI7s6iCcP
viVGzWN9y5XYpVAQ0qLSt5fRDWz7+QXob6hLvZVnnnuUWKltk/3gEsXNtIpkUjFf
DuOJhHHamN1L7AIlpX01/mPas6zspUYPDWQjXG3z7MwoYyPAS5rsj8HusaI+ck1w
tQnB67QQVTyL6huUfkt05vSfT6ZFMLXwuLTRWVBlCoZT6kyfnvRYbDH1FzpvV4vL
X/AoC0WSjTAgSf9S5izLGJrX5u4+TzQ1FRPFAtrFX777W86Nv7U1djx85pw7JodN
jYDmFsYn8lBJtnJ0Q0lJRDi7eEMj7hY+2WLmpdcCAwEAAaOCASQwggEgMAkGA1Ud
EwQCMAAwHQYDVR0OBBYEFC2Yo5k5HP7pmm0XlNI6lu7IngQiMB8GA1UdIwQYMBaA
FGqrU2SSNocjNLMdb4VL9d9aXHSPMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggr
BgEFBQcDATCBsAYDVR0RBIGoMIGlghF3ZWItcGxhdGZvcm0udGVzdIIVd3d3Lndl
Yi1wbGF0Zm9ybS50ZXN0gil4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWItcGxh
dGZvcm0udGVzdIIeeG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0ghZ3d3cy
LndlYi1wbGF0Zm9ybS50ZXN0ghZ3d3cxLndlYi1wbGF0Zm9ybS50ZXN0MA0GCSqG
SIb3DQEBCwUAA4IBAQAz2/fw9pIWTy1CvLiq5qte+bmwSK61jcwCe+lvTnX3F6Be
e4cGSUiDxbvKlQc3Dl3jl96eDKSCMBGBSV1QKXKSpcoXsXzxMhEXV+ZZwazjOybS
lJdQarlUiISbb7EG9YAEIhAUsfWXJfxm1mmjNgiFI/+OPCvgbedh8QCPYT2wh61y
IfbwzE/JIL+DEQ8h9LjA3ZxR17snMuyrpGIUKDLa8oeAaJzqrOv1f/Xe9MA5kch2
pO7QqFDbwUv5xD3Z6I62P8CWeRLY+k0KszZ2qk6ygi+i1A3b/WR3b27plH8PyDo8
lj3NTWy6ZpX3tJ2klJ+Xs5oN3BiMEQtWZY5GTOZe
-----END CERTIFICATE-----
\ No newline at end of file
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzhNaLAVkYhdHc
Mt8495CFGz6lXoE+L/w6X3937yO7OognD74lRs1jfcuV2KVQENKi0reX0Q1s+/kF
6G+oS72VZ557lFipbZP94BLFzbSKZFIxXw7jiYRx2pjdS+wCJaV9Nf5j2rOs7KVG
Dw1kI1xt8+zMKGMjwEua7I/B7rGiPnJNcLUJweu0EFU8i+oblH5LdOb0n0+mRTC1
8Li00VlQZQqGU+pMn570WGwx9Rc6b1eLy1/wKAtFko0wIEn/UuYsyxia1+buPk80
NRUTxQLaxV+++1vOjb+1NXY8fOacOyaHTY2A5hbGJ/JQSbZydENJSUQ4u3hDI+4W
Ptli5qXXAgMBAAECggEBAIcwDQSnIjo2ZECHytQykpG6X6XXEksLhc1Lp0lhPC49
uNR5pX6a4AcBb3PLr0opMQZO2tUoKA0ff3t0e8loKD+/xXhY0Z/dlioEOP7elwv0
2nS1mhe9spCuxpk4GGXRhdtR8t2tj8s0do3YvgPgITXoEDX6YBZHNGhZpzSrFPgQ
/c3eGCVmzWYuLFfdj5OPQ9bwTaY4JSvDLZT0/WTgiica7VySwfz3HP1fFqNykTiK
ACQREvtxfk5Ym2nT6oni7CM2zOEJL9SXicXI5HO4bERH0ZYh//F3g6mwGiFXUJPd
NKgaTM1oT9kRGkUaEYsRWrddwR8d5mXLvBuTJbgIsSECgYEA1+2uJSYRW1OqbhYP
ms59YQHSs3VjpJpnCV2zNa2Wixs57KS2cOH7B6KrQCogJFLtgCDVLtyoErfVkD7E
FivTgYr1pVCRppJddQzXik31uOINOBVffr7/09g3GcRN+ubHPZPq3K+dD6gHa3Aj
0nH1EjEEV0QpSTQFn87OF2mc9wcCgYEA1NVqMbbzd+9Xft5FXuSbX6E+S02dOGat
SgpnkTM80rjqa6eHdQzqk3JqyteHPgdi1vdYRlSPOj/X+6tySY0Ej9sRnYOfddA2
kpiDiVkmiqVolyJPY69Utj+E3TzJ1vhCQuYknJmB7zP9tDcTxMeq0l/NaWvGshEK
yC4UTQog1rECgYASOFILfGzWgfbNlzr12xqlRtwanHst9oFfPvLSQrWDQ2bd2wAy
Aj+GY2mD3oobxouX1i1m6OOdwLlalJFDNauBMNKNgoDnx03vhIfjebSURy7KXrNS
JJe9rm7n07KoyzRgs8yLlp3wJkOKA0pihY8iW9R78JpzPNqEo5SsURMXnQKBgBlV
gfuC9H4tPjP6zzUZbyk1701VYsaI6k2q6WMOP0ox+q1v1p7nN7DvaKjWeOG4TVqb
PKW6gQYE/XeWk9cPcyCQigs+1KdYbnaKsvWRaBYO1GFREzQhdarv6qfPCZOOH40J
Cgid+Sp4/NULzU2aGspJ3xCSZKdjge4MFhyJfRkxAoGBAJlwqY4nue0MBLGNpqcs
WwDtSasHvegKAcxGBKL5oWPbLBk7hk+hdqc8f6YqCkCNqv/ooBspL15ESItL+6yT
zt0YkK4oH9tmLDb+rvqZ7ZdXbWSwKITMoCyyHUtT6OKt/RtA0Vdy9LPnP27oSO/C
dk8Qf7KgKZLWo0ZNkvw38tEC
-----END PRIVATE KEY-----
\ No newline at end of file
......@@ -3,11 +3,11 @@ from setuptools import setup, find_packages
PACKAGE_VERSION = '0.3'
deps = [
'marionette_client == 2.2.0',
'marionette_driver == 1.3.0',
'marionette_harness == 4.0.0',
'marionette_driver == 2.2.0',
'mozfile == 1.2',
'mozinfo == 0.8',
'mozlog == 3.1',
'mozinfo == 0.9',
'mozlog == 3.4',
]
setup(name='tor-browser-tests',
......
from marionette.runtests import cli as mn_cli
from marionette_harness.runtests import cli as mn_cli
def cli():
mn_cli()
......
from marionette_driver import By, Wait
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
def test_check_tpo(self):
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
......@@ -7,7 +7,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By, Actions
from marionette_driver.errors import MarionetteException, JavascriptException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
# expected values for navigation properties
nav_props = {"appCodeName": "Mozilla",
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
def test_plugins(self):
......
......@@ -2,7 +2,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
def test_screen_coords(self):
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
def test_screen_dims(self):
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
def test_useragent(self):
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
......@@ -6,7 +6,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
......
......@@ -3,7 +3,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException, NoSuchElementException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
......@@ -7,7 +7,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
......
from marionette_driver import By, Actions
from marionette_driver.errors import MarionetteException, JavascriptException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
......@@ -6,7 +6,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
......@@ -9,7 +9,7 @@
from marionette_driver import By, Wait
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
from marionette_driver import By
from marionette_driver.errors import MarionetteException, JavascriptException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
import testsuite
......
......@@ -6,7 +6,7 @@
from marionette_driver import By
from marionette_driver.errors import MarionetteException
from marionette import MarionetteTestCase
from marionette_harness import MarionetteTestCase
class Test(MarionetteTestCase):
......
#!/usr/bin/perl -w
use strict;
use FindBin;
use File::Copy;
use IO::CaptureOutput qw(qxx);
use Cwd;
use English;
......@@ -12,7 +13,7 @@ sub winpath {
return $res;
}
my $virtenv_marionette_dir = winpath("$FindBin::Bin/virtualenv-marionette");
my $virtenv_marionette_dir = winpath("$FindBin::Bin/virtualenv-marionette-4.0.0");
my $virtenv_pefile_dir = winpath("$FindBin::Bin/virtualenv-pefile");
sub run {
......@@ -29,8 +30,10 @@ sub run_from_dir {
my $virtualenv_cmd = 'virtualenv';
my $bin = 'bin';
my $lib = 'lib';
if ($OSNAME eq 'cygwin') {
$bin = 'Scripts';
$lib = 'Lib';
$virtualenv_cmd = "$FindBin::Bin/bundle/python/Scripts/virtualenv.exe";
run("$FindBin::Bin/bundle/install_virtualenv.sh")
unless -f $virtualenv_cmd;
......@@ -39,6 +42,10 @@ if ($OSNAME eq 'cygwin') {
unless (-d $virtenv_marionette_dir) {
run($virtualenv_cmd, $virtenv_marionette_dir);
run_from_dir('marionette', "$virtenv_marionette_dir/$bin/python", 'setup.py', 'develop');
# Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1345274
my $marionette_runner_dir = "$virtenv_marionette_dir/$lib/python2.7/site-packages/marionette_harness-4.0.0-py2.7.egg/marionette_harness/runner/";
copy "$FindBin::Bin/data/marionette_certs/test.cert", $marionette_runner_dir;
copy "$FindBin::Bin/data/marionette_certs/test.key", $marionette_runner_dir;
}
if ($OSNAME eq 'cygwin') {
......
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