[Pkg-mozext-commits] [compactheader] 278/441: Updated version handling in mozmill tests.

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:29:09 UTC 2015 

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 98a8ea055c6afd96e274f052d8fde3cf908254ca
Author: joachim <none at none>
Date:   Sat Sep 10 19:57:38 2011 +0200

    Updated version handling in mozmill tests.
    
    --HG--
    branch : review_requests
---
 test/executeTests.pl | 43 +++++++++++++++++++++++++++++++------------
 test/testapps.csv    | 30 +++++++++++++++---------------
 2 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/test/executeTests.pl b/test/executeTests.pl
index 5122fcc..d5ce2a5 100644
--- a/test/executeTests.pl
+++ b/test/executeTests.pl
@@ -52,7 +52,7 @@ print "xpi: $xpi\n";
 my $ftpdir = "ftp";
 
 my ($ostype,$hosttype,$version,$ftppath,$app,$tests,$lightning);
-my ($unpack, $unpackargs, $unpacktargetargs, $appbin);
+my ($unpack, $unpackargs, $unpacktargetargs, $appbin, $virtualpython);
 my ($sysname, $nodename, $release, $osversion, $machine) = POSIX::uname();
 
 open (F, $file) || die ("Could not open $file!");
@@ -60,16 +60,18 @@ open (F, $file) || die ("Could not open $file!");
 mkdir "$ftpdir";
 
 if ($^O eq "msys") {
-  $unpack ="unzip";
-  $unpackargs="-o";
-  $unpacktargetargs="-d";
-  $appbin="thunderbird.exe";
+  $unpack = "unzip";
+  $unpackargs = "-o";
+  $unpacktargetargs = "-d";
+  $appbin = "thunderbird.exe";
+  $virtualpython = "../mozmill-virtualenv/Scripts/python";
 }
 elsif ($^O eq "linux") {
-  $unpack ="tar";
-  $unpackargs="xjvf";
-  $unpacktargetargs="-C";
-  $appbin="thunderbird";
+  $unpack = "tar";
+  $unpackargs = "xjvf";
+  $unpacktargetargs = "-C";
+  $appbin = "thunderbird";
+  $virtualpython = "../mozmill-virtualenv/bin/python";
 }
 
 
@@ -78,9 +80,15 @@ while (my $line = <F>)
   ($ostype,$hosttype,$version,$ftppath,$app,$tests,$lightning) =
     parse_csv($line);
 
+  $ftppath =~ s/_VER_/${version}/g;
+  $app =~ s/_VER_/${version}/g;
+  $tests =~ s/_VER_/${version}/g;
+
   next if (not defined($ostype));
   print "$ostype\t$hosttype\t$version\t$ftppath\t$app\t$tests\n";
 
+#  next if ($version lt "9.0");
+
   if (($ostype eq $^O)
       && ($hosttype eq $machine)
       ) {
@@ -117,9 +125,20 @@ while (my $line = <F>)
     system "pwd";
 
     my $log;
-   $log = $log . `python runtest.py --binary=../thunderbird/$appbin --showall --show-errors -a $xpi -t compactheader 2>&1`;
-#    $log = $log . `python runtest.py --binary=../thunderbird/$appbin --showall --show-errors -a $xpi -t compactheader/test-compactheader-toolbar.js 2>&1`;
-    $log = $log . `python runtest.py --binary=../thunderbird/$appbin --showall --show-errors -a $xpi,../../ftp//$ostype-$hosttype-$version/lightning.xpi -t compactheader/test-compactheader-preferences.js 2>&1`;
+    my $python;
+
+    if ($version ge "9.0") {
+      system "python resources/installmozmill.py ../mozmill-virtualenv";
+      $python = "$virtualpython";
+    }
+    else {
+      $python = "python"
+    }
+
+    print "$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader 2>&1\n";
+   $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader 2>&1`;
+#    $log = $log . `python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader/test-compactheader-toolbar.js 2>&1`;
+    $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi,../../ftp//$ostype-$hosttype-$version/lightning.xpi -t compactheader/test-compactheader-preferences.js 2>&1`;
 
     chdir "$currentdir";
     my @timeData = localtime(time);
diff --git a/test/testapps.csv b/test/testapps.csv
index 28464a8..bb6e3d6 100644
--- a/test/testapps.csv
+++ b/test/testapps.csv
@@ -1,15 +1,15 @@
-"msys","i686","5.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/5.0-candidates/build1/unsigned/win32/en-US/","thunderbird-5.0.zip","thunderbird-5.0.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/win32/lightning.xpi"
-"linux","i686","5.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/5.0-candidates/build1/linux-i686/en-US/","thunderbird-5.0.tar.bz2","thunderbird-5.0.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
-"linux","x86_64","5.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/5.0-candidates/build1/linux-x86_64/en-US/","thunderbird-5.0.tar.bz2","thunderbird-5.0.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
-"msys","i686","6.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0-candidates/build2/unsigned/win32/en-US/","thunderbird-6.0.zip","thunderbird-6.0.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/win32/lightning.xpi"
-"linux","i686","6.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0-candidates/build2/linux-i686/en-US/","thunderbird-6.0.tar.bz2","thunderbird-6.0.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
-"linux","x86_64","6.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0-candidates/build2/linux-x86_64/en-US/","thunderbird-6.0.tar.bz2","thunderbird-6.0.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
-"msys","i686","7.0b1","https://ftp.mozilla.org/pub/thunderbird/nightly/7.0b1-candidates/build1/unsigned/win32/en-US/","thunderbird-7.0b1.zip","thunderbird-7.0b1.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/win32/lightning.xpi"
-"linux","i686","7.0b1","https://ftp.mozilla.org/pub/thunderbird/nightly/7.0b1-candidates/build1/linux-i686/en-US/","thunderbird-7.0b1.tar.bz2","thunderbird-7.0b1.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
-"linux","x86_64","7.0b1","https://ftp.mozilla.org/pub/thunderbird/nightly/7.0b1-candidates/build1/linux-x86_64/en-US/","thunderbird-7.0b1.tar.bz2","thunderbird-7.0b1.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
-"msys","i686","8.0a2","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-aurora/","thunderbird-8.0a2.en-US.win32.zip","thunderbird-8.0a2.en-US.win32.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-miramar/win32-xpi/lightning.xpi"
-"linux","i686","8.0a2","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-aurora/","thunderbird-8.0a2.en-US.linux-i686.tar.bz2","thunderbird-8.0a2.en-US.linux-i686.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-miramar/linux-xpi/lightning.xpi"
-"linux","x86_64","8.0a2","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-aurora/","thunderbird-8.0a2.en-US.linux-x86_64.tar.bz2","thunderbird-8.0a2.en-US.linux-x86_64.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-miramar/linux64-xpi/lightning.xpi"
-"msys","i686","9.0a1","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-central/","thunderbird-9.0a1.en-US.win32.zip","thunderbird-9.0a1.en-US.win32.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/win32-xpi/lightning.xpi"
-"linux","i686","9.0a1","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-central/","thunderbird-9.0a1.en-US.linux-i686.tar.bz2","thunderbird-9.0a1.en-US.linux-i686.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/linux-xpi/lightning.xpi"
-"linux","x86_64","9.0a1","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-central/","thunderbird-9.0a1.en-US.linux-x86_64.tar.bz2","thunderbird-9.0a1.en-US.linux-x86_64.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/linux64-xpi/lightning.xpi"
+"msys","i686","5.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/_VER_-candidates/build1/unsigned/win32/en-US/","thunderbird-_VER_.zip","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/win32/lightning.xpi"
+"linux","i686","5.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/_VER_-candidates/build1/linux-i686/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
+"linux","x86_64","5.0","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/_VER_-candidates/build1/linux-x86_64/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
+"msys","i686","6.0.2","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/_VER_-candidates/build2/unsigned/win32/en-US/","thunderbird-_VER_.zip","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/win32/lightning.xpi"
+"linux","i686","6.0.2","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/_VER_-candidates/build2/linux-i686/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
+"linux","x86_64","6.0.2","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/_VER_-candidates/build2/linux-x86_64/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
+"msys","i686","7.0b2","https://ftp.mozilla.org/pub/thunderbird/nightly/_VER_-candidates/build2/unsigned/win32/en-US/","thunderbird-_VER_.zip","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/win32/lightning.xpi"
+"linux","i686","7.0b2","https://ftp.mozilla.org/pub/thunderbird/nightly/_VER_-candidates/build2/linux-i686/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
+"linux","x86_64","7.0b2","https://ftp.mozilla.org/pub/thunderbird/nightly/_VER_-candidates/build2/linux-x86_64/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/releases/1.0b5rc3/linux/lightning.xpi"
+"msys","i686","8.0a2","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-aurora/","thunderbird-_VER_.en-US.win32.zip","thunderbird-_VER_.en-US.win32.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-miramar/win32-xpi/lightning.xpi"
+"linux","i686","8.0a2","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-aurora/","thunderbird-_VER_.en-US.linux-i686.tar.bz2","thunderbird-_VER_.en-US.linux-i686.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-miramar/linux-xpi/lightning.xpi"
+"linux","x86_64","8.0a2","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-aurora/","thunderbird-_VER_.en-US.linux-x86_64.tar.bz2","thunderbird-_VER_.en-US.linux-x86_64.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-miramar/linux64-xpi/lightning.xpi"
+"msys","i686","9.0a1","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-central/","thunderbird-_VER_.en-US.win32.zip","thunderbird-_VER_.en-US.win32.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/win32-xpi/lightning.xpi"
+"linux","i686","9.0a1","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-central/","thunderbird-_VER_.en-US.linux-i686.tar.bz2","thunderbird-_VER_.en-US.linux-i686.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/linux-xpi/lightning.xpi"
+"linux","x86_64","9.0a1","https://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-central/","thunderbird-_VER_.en-US.linux-x86_64.tar.bz2","thunderbird-_VER_.en-US.linux-x86_64.tests.zip","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/linux64-xpi/lightning.xpi"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git

More information about the Pkg-mozext-commits mailing list