[Pkg-mozext-commits] [compactheader] 418/441: First fixes for tests with thunderbird 36.0a1
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:23 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 0e62eed5f4a671a2f532befd77b6361b8c673136
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date: Sun Nov 9 00:34:50 2014 +0100
First fixes for tests with thunderbird 36.0a1
--HG--
branch : 36.0a1
---
test/compactheader/test-compactheader-collapse.js | 16 +++--
.../test-compactheader-context-copy.js | 10 ++--
.../test-compactheader-dark-on-focus.js | 2 -
.../test-compactheader-preferences.js | 10 ++--
test/compactheader/test-compactheader-toolbar.js | 68 +++++++++++-----------
test/compactheader/test-more-button.js | 6 +-
test/executeTests.pl | 17 +++---
7 files changed, 60 insertions(+), 69 deletions(-)
diff --git a/test/compactheader/test-compactheader-collapse.js b/test/compactheader/test-compactheader-collapse.js
index 6bac438..a5c0808 100644
--- a/test/compactheader/test-compactheader-collapse.js
+++ b/test/compactheader/test-compactheader-collapse.js
@@ -74,8 +74,6 @@ function setupModule(module) {
abh.installInto(module);
let meh = collector.getModule('mouse-event-helpers');
meh.installInto(module);
- let meh = collector.getModule('mouse-event-helpers');
- meh.installInto(module);
let chh = collector.getModule('compactheader-helpers');
chh.installInto(module);
@@ -93,7 +91,7 @@ function setupModule(module) {
}});
add_message_to_folder(folder1, msg);
- let msg = create_message({cc: msgGen.makeNamesAndAddresses(2), // YYY
+ let msg2 = create_message({cc: msgGen.makeNamesAndAddresses(2), // YYY
subject: "This is a really, really, really, really, really, really, really, really, long subject.",
clobberHeaders: {
"Newsgroups": "alt.test",
@@ -101,9 +99,9 @@ function setupModule(module) {
"Content-Base": "http://example.com/",
"Bcc": "Richard Roe <richard.roe at momo.invalid>"
}});
- add_message_to_folder(folder1, msg);
+ add_message_to_folder(folder1, msg2);
- let msg = create_message({
+ let msg3 = create_message({
subject: "This is a short subject.",
to: [["T Toe", "t.toe at t.invalid"]],
clobberHeaders: {
@@ -111,12 +109,12 @@ function setupModule(module) {
"cc": "S Soe <s.soe at s.invalid>",
},
});
- add_message_to_folder(folder1, msg);
+ add_message_to_folder(folder1, msg3);
- let msg = create_message({cc: msgGen.makeNamesAndAddresses(3),
+ let msg4 = create_message({cc: msgGen.makeNamesAndAddresses(3),
to: msgGen.makeNamesAndAddresses(1)
});
- add_message_to_folder(folder1, msg);
+ add_message_to_folder(folder1, msg4);
}
function teardownModule() {
@@ -159,7 +157,7 @@ function test_wide_layout_and_compact() {
set_pane_layout(kClassicMailLayout);
assert_pane_layout(kClassicMailLayout);
- let abwc = openAddressBook();
+ abwc = openAddressBook();
// The 3pane window is closed and opened again.
close3PaneWindow();
diff --git a/test/compactheader/test-compactheader-context-copy.js b/test/compactheader/test-compactheader-context-copy.js
index d2b1faf..3d6154b 100644
--- a/test/compactheader/test-compactheader-context-copy.js
+++ b/test/compactheader/test-compactheader-context-copy.js
@@ -65,8 +65,6 @@ function setupModule(module) {
abh.installInto(module);
let meh = collector.getModule('mouse-event-helpers');
meh.installInto(module);
- let meh = collector.getModule('mouse-event-helpers');
- meh.installInto(module);
let chh = collector.getModule('compactheader-helpers');
chh.installInto(module);
@@ -80,12 +78,12 @@ function setupModule(module) {
add_message_to_folder(folder1, msg);
// create a message which looks like an RSS feed
- let msg = create_message({to: msgGen.makeNamesAndAddresses(1), // YYY
+ let msg2 = create_message({to: msgGen.makeNamesAndAddresses(1), // YYY
subject: "RSS feed message",
clobberHeaders: {
"Content-Base": FEED_ADDR
}});
- add_message_to_folder(folder1, msg);
+ add_message_to_folder(folder1, msg2);
}
@@ -129,7 +127,7 @@ function test_without_linkify() {
assert_equals(null, mc.e("CompactHeader_collapsedsubjectlinkBox"));
// select RSS message
- let curMessage = select_message_in_folder(folder1, 1, mc);
+ curMessage = select_message_in_folder(folder1, 1, mc);
expand_and_assert_header(mc);
// check context menu of subject = Copy
@@ -196,7 +194,7 @@ function test_with_linkify() {
mc.click_menus_in_sequence(mc.e("copyPopup"), [{id: "copyMenuitem"}]);
assert_clipboard_content(curMessage.mime2DecodedSubject);
- let curMessage = select_message_in_folder(folder1, 1, mc);
+ curMessage = select_message_in_folder(folder1, 1, mc);
expand_and_assert_header(mc);
// check context menu of subject = Copy
diff --git a/test/compactheader/test-compactheader-dark-on-focus.js b/test/compactheader/test-compactheader-dark-on-focus.js
index 30d069f..cba2353 100644
--- a/test/compactheader/test-compactheader-dark-on-focus.js
+++ b/test/compactheader/test-compactheader-dark-on-focus.js
@@ -64,8 +64,6 @@ function setupModule(module) {
abh.installInto(module);
let meh = collector.getModule('mouse-event-helpers');
meh.installInto(module);
- let meh = collector.getModule('mouse-event-helpers');
- meh.installInto(module);
let chh = collector.getModule('compactheader-helpers');
chh.installInto(module);
diff --git a/test/compactheader/test-compactheader-preferences.js b/test/compactheader/test-compactheader-preferences.js
index 6f135af..6783fe6 100644
--- a/test/compactheader/test-compactheader-preferences.js
+++ b/test/compactheader/test-compactheader-preferences.js
@@ -88,8 +88,6 @@ function setupModule(module) {
abh.installInto(module);
let meh = collector.getModule('mouse-event-helpers');
meh.installInto(module);
- let meh = collector.getModule('mouse-event-helpers');
- meh.installInto(module);
let chh = collector.getModule('compactheader-helpers');
chh.installInto(module);
@@ -121,11 +119,11 @@ function setupModule(module) {
addToFolder("test encoded ISO-8859-1", messageBodyISO8859_1, folder1, "iso-8859-1");
addToFolder("test encoded UTF-8", messageBodyUTF8, folder1, "utf-8");
- let msg = create_message();
- add_message_to_folder(folder1, msg);
+ let msg2 = create_message();
+ add_message_to_folder(folder1, msg2);
- let msg = create_message();
- add_message_to_folder(folder2, msg);
+ let msg3 = create_message();
+ add_message_to_folder(folder2, msg3);
}
diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index 87cff9c..e139f40 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -195,8 +195,8 @@ function test_customize_header_toolbar_check_default()
let msgc = open_selected_message_in_new_window();
assert_selected_and_displayed(msgc, curMessage);
expand_and_assert_header(msgc);
- let hdrToolbar = msgc.eid("header-view-toolbar").node;
- let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+ hdrToolbar = msgc.eid("header-view-toolbar").node;
+ hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
// In a fresh profile the currentset attribute does not
// exist, i.e. it returns empty. So check for both valid
@@ -341,15 +341,15 @@ function test_customize_header_toolbar_separate_window()
select_message_in_folder(folder1, 0, mc);
// Check, if the buttons in the mail3pane window are the correct ones.
- let hdrToolbar = mc.eid("header-view-toolbar").node;
- let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+ hdrToolbar = mc.eid("header-view-toolbar").node;
+ hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
// Open separate mail window again and check another time.
- let msgc = open_selected_message_in_new_window();
+ msgc = open_selected_message_in_new_window();
assert_selected_and_displayed(msgc, curMessage);
- let toolbar = msgc.eid("header-view-toolbar").node;
+ toolbar = msgc.eid("header-view-toolbar").node;
assert_equals(filterInvisibleButtons(msgc, toolbar.currentSet), reverseSet);
assert_equals(filterInvisibleButtons(msgc, toolbar.getAttribute("currentset")),
reverseSet);
@@ -385,7 +385,7 @@ function test_customize_header_toolbar_remove_buttons(){
close_header_pane_toolbar_customization(ctc);
// Check, if the toolbar is really empty.
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
"__empty");
@@ -419,16 +419,16 @@ function test_customize_header_toolbar_remove_buttons(){
abwc.window.close();
select_message_in_folder(folder1, 0, mc);
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
"__empty");
// Check that all removed buttons show up in the palette
// and move it back in the toolbar.
- let ctc = open_header_pane_toolbar_customization(mc);
- let toolbar = mc.eid("header-view-toolbar").node;
- let palette = ctc.e("palette-box");
+ ctc = open_header_pane_toolbar_customization(mc);
+ toolbar = mc.eid("header-view-toolbar").node;
+ palette = ctc.e("palette-box");
for (let i=0; i<lCurrentset.length; i++) {
let button = ctc.e(lCurrentset[i]);
assert_true(button!=null, "Button " + lCurrentset[i] + " not in palette");
@@ -438,7 +438,7 @@ function test_customize_header_toolbar_remove_buttons(){
}
close_header_pane_toolbar_customization(ctc);
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
filterInvisibleButtons(mc, hdrBarDefaultSet));
assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
@@ -494,9 +494,9 @@ function test_customize_header_toolbar_add_all_buttons(){
// No buttons are left in the palette
// Get all buttons in the palette and move them to toolbar
- let ctc = open_header_pane_toolbar_customization(mc);
- let palette = ctc.e("palette-box");
- let tmp = ctc.window.document.getElementById("palette-box").
+ ctc = open_header_pane_toolbar_customization(mc);
+ palette = ctc.e("palette-box");
+ tmp = ctc.window.document.getElementById("palette-box").
getElementsByTagName("toolbarpaletteitem");
let leftButtons = new Array;
@@ -513,7 +513,7 @@ function test_customize_header_toolbar_add_all_buttons(){
close_header_pane_toolbar_customization(ctc);
// Move the buttons back to palette
- let ctc = open_header_pane_toolbar_customization(mc);
+ ctc = open_header_pane_toolbar_customization(mc);
let target = ctc.e("palette-box");
for (let i=wrappedButtons.length-1; i>= 0; i--) {
let button = mc.e(wrappedButtons[i]);
@@ -529,9 +529,9 @@ function test_customize_header_toolbar_add_all_buttons(){
filterInvisibleButtons(mc, hdrBarDefaultSet));
// All buttons have shown up in the palette
- let ctc = open_header_pane_toolbar_customization(mc);
- let backButtons = new Array;
- let tmp = ctc.window.document.getElementById("palette-box").
+ ctc = open_header_pane_toolbar_customization(mc);
+ backButtons = new Array;
+ tmp = ctc.window.document.getElementById("palette-box").
getElementsByTagName("toolbarpaletteitem");
for (let i=tmp.length-1; i>=0; i--) {
let type = tmp[i].getAttribute("type");
@@ -548,10 +548,10 @@ function test_customize_header_toolbar_add_all_buttons(){
// Reopen customization dialog and
// all buttons are still in the palette
select_message_in_folder(folder1, 1, mc);
- let ctc = open_header_pane_toolbar_customization(mc);
+ ctc = open_header_pane_toolbar_customization(mc);
- let backButtons = new Array;
- let tmp = ctc.window.document.getElementById("palette-box").
+ backButtons = new Array;
+ tmp = ctc.window.document.getElementById("palette-box").
getElementsByTagName("toolbarpaletteitem");
for (let i=tmp.length-1; i>=0; i--) {
let type = tmp[i].getAttribute("type");
@@ -619,7 +619,7 @@ function test_customize_header_toolbar_change_button_style(){
// Restore the default buttons to get defined starting conditions.
restore_and_check_default_buttons(mc);
// The default mode is icon visible only.
-
+
subtest_buttons_style("-moz-box", "none");
// Change the button style to text and icon mode
@@ -632,8 +632,8 @@ function test_customize_header_toolbar_change_button_style(){
subtest_buttons_style("-moz-box", "-moz-box");
// Change the button style to icon mode only
- let ctc = open_header_pane_toolbar_customization(mc);
- let iconMode = ctc.window.document.getElementById("main-box").
+ ctc = open_header_pane_toolbar_customization(mc);
+ iconMode = ctc.window.document.getElementById("main-box").
querySelector("[value='icons']");
ctc.click(new elib.Elem(iconMode));
close_header_pane_toolbar_customization(ctc);
@@ -641,7 +641,7 @@ function test_customize_header_toolbar_change_button_style(){
subtest_buttons_style("-moz-box", "none");
// Change the button style to text (only) mode
- let ctc = open_header_pane_toolbar_customization(mc);
+ ctc = open_header_pane_toolbar_customization(mc);
let textMode = ctc.window.document.getElementById("main-box").
querySelector("[value='text']");
ctc.click(new elib.Elem(textMode));
@@ -665,10 +665,10 @@ function test_visible_toolbar() {
assert_equals(isVisible(toolbar), true);
open_preferences_dialog(mc, subtest_change_twoline);
collapse_and_assert_header(mc);
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(isVisible(toolbar), true);
expand_and_assert_header(mc);
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(isVisible(toolbar), true);
set_pane_layout(kWideMailLayout);
@@ -681,17 +681,17 @@ function test_visible_toolbar() {
abwc.window.close();
mc.sleep(10);
-
+
collapse_and_assert_header(mc);
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(isVisible(toolbar), true);
expand_and_assert_header(mc);
- let toolbar = mc.eid("header-view-toolbar").node;
+ toolbar = mc.eid("header-view-toolbar").node;
assert_equals(isVisible(toolbar), true);
-
+
set_pane_layout(kClassicMailLayout);
assert_pane_layout(kClassicMailLayout);
- let abwc = openAddressBook();
+ abwc = openAddressBook();
// The 3pane window is closed and opened again.
close3PaneWindow();
@@ -819,7 +819,7 @@ function subtest_buttons_style(aIconVisibility, aLabelVisibility)
if (mc.eid(currentSet[i]).node.tagName == "toolbarbutton") {
let icon = mc.aid(currentSet[i], {class: "toolbarbutton-icon"}).node;
let label = mc.aid(currentSet[i], {class: "toolbarbutton-text"}).node;
-
+
if (!icon) {
let exp1 = mc.e(currentSet[i]);
let node = mc.window.document.getAnonymousElementByAttribute(exp1, "anonid", "button");
diff --git a/test/compactheader/test-more-button.js b/test/compactheader/test-more-button.js
index c63eeb7..0ffa0a3 100644
--- a/test/compactheader/test-more-button.js
+++ b/test/compactheader/test-more-button.js
@@ -61,8 +61,6 @@ function setupModule(module) {
abh.installInto(module);
let meh = collector.getModule('mouse-event-helpers');
meh.installInto(module);
- let meh = collector.getModule('mouse-event-helpers');
- meh.installInto(module);
let chh = collector.getModule('compactheader-helpers');
chh.installInto(module);
@@ -101,7 +99,7 @@ function test_click_more(){
assert_true(isVisible(moreIndicator))
if (moreIndicator) {
mc.click(moreIndicator);
- }
+ }
assert_expanded(mc);
let expandedToBox = mc.e("expandedtoBox");
@@ -227,7 +225,7 @@ function test_more_number_indicator(){
let hiddenAddressesCC = numAddressesCC - firstCCAddrNum;
let hiddenAddressesTo = numAddressesTo - firstToAddrNum;
-
+
let expandedToBox = mc.e("expandedtoBox");
let expandedCCBox = mc.e("expandedccBox");
let eTOmoreIndicator = mc.window.document.getAnonymousElementByAttribute(
diff --git a/test/executeTests.pl b/test/executeTests.pl
index 5a51cdb..140a274 100644
--- a/test/executeTests.pl
+++ b/test/executeTests.pl
@@ -95,9 +95,9 @@ my $mnenhy = "https://addons.mozilla.org/thunderbird/downloads/latest/2516/addon
my %testSpecs;
-system "wget", "-q", "-P", "$ftpdir", "-N", "$dispMUA";
+system "wget", "--no-check-certificate", "-q", "-P", "$ftpdir", "-N", "$dispMUA";
-system "wget", "-q", "-P", "$ftpdir", "-N", "$mnenhy";
+system "wget", "--no-check-certificate", "-q", "-P", "$ftpdir", "-N", "$mnenhy";
while (my $line = <F>)
{
@@ -120,7 +120,8 @@ while (my $line = <F>)
}
#print "wget -r -l1 --no-parent --follow-ftp -A$checksum $ftppath -nd -P $ftpdir 2>&1\n";
#print "wget -r -l1 --no-parent --follow-ftp -A$checksum $ftppath -nd -P \"$ftpdir\";\n";
- `wget -r -l1 --no-parent --follow-ftp -A$checksum $ftppath -nd -P "$ftpdir" 2>&1`;
+ print "wget -r -l1 --no-parent --follow-ftp -A$checksum $ftppath -nd -P \"$ftpdir\" 2>&1";
+ `wget -r -l1 --no-check-certificate --no-parent --follow-ftp -A$checksum $ftppath -nd -P "$ftpdir" 2>&1`;
@files = glob("$ftpdir/thunderbird*$checksum");
my $file = $files[0];
@@ -157,9 +158,9 @@ while (my $line = <F>)
my $testdir = "/tmp/compactheader/test-$version";
mkdir "$testdir";
- system "wget", "-q", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$ftppath/$app";
- system "wget", "-q", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$ftppath/$tests";
- system "wget", "-q", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$lightning";
+ system "wget", "--no-check-certificate", "-q", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$ftppath/$app";
+ system "wget", "--no-check-certificate", "-q", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$ftppath/$tests";
+ system "wget", "--no-check-certificate", "-q", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$lightning";
system $unpack, $unpackargs, "$ftpdir//$ostype-$hosttype-$version/$app", $unpacktargetargs, $testdir;
system "unzip", "-q", "-o", "$ftpdir//$ostype-$hosttype-$version/$tests", "-d", $testdir, "-x", "*mochitest*", "*xpcshell*", "*reftest*";
@@ -222,7 +223,7 @@ foreach my $pid (@children) {
print "\n";
print getcwd;
print "... installing mozmill\n";
- `python resources/installmozmill.py ../mozmill-virtualenv`;
+ `python resources/installmozmill.py ../mozmill-virtualenv ../mozbase/`;
$python = "$virtualpython";
}
else {
@@ -244,7 +245,7 @@ foreach my $pid (@children) {
"$xpi"
# "$mnenhyfile" # activate when mozmill can handle this addon:
);
-
+
@compatibility_apps = grep { $_ && !m/^\s+$/ } @compatibility_apps;
my $comp_apps = join(",", @compatibility_apps);
--
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