1261943 - clean up TB mozmill tests using the account wizard

Status: RESOLVED FIXED

(Thunderbird :: Testing Infrastructure, enhancement)

Description

[:aceman]

I've found these 3 mozmill tests that use the account wizard and use a server config file to determine the account configuration:
mozmill/account/test-mail-account-setup-wizard.js
mozmill/account/test-retest-config.js
mozmill/instrumentation/test-instrument-setup.js

I propose to clean them up a bit. Some imports can be removed, some boilerplate code shortened.
Also they use mozmill/account/html/ and mozmill/account/xml/ to store the server config files. That is, 2 folders for the same thing (a xml config file). This can be merged.

Comment 1

[:aceman]

Attachment: patch

Try run: https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=15d1bfc528587ff848bce69a9b46f2ba5f1a575c

Comment 2

[Magnus Melin [:mkmelin]]

Comment on attachment 8737936 [details] [diff] [review]
patch

Review of attachment 8737936 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good to me, except the .com -> .invalid changes

::: mail/test/mozmill/account/test-mail-account-setup-wizard.js
@@ +69,5 @@
>    let url = collector.addHttpResource("../account/xml", "autoconfig");
>    Services.prefs.setCharPref(pref_name, url);
>  
>    // Force .com MIME-Type to text/xml
> +  collector.httpd.registerContentType("invalid", "text/xml");

Why this change? example.com is actually a real domain reserved for testing usage

Comment 3

[:aceman]

Yes, it is a real domain that can be looked up and does exist. .invalid does not really exist so we may avoid hitting the network accidentaly. But I can revert it back if you wish, it is not critically needed to solve the bug.

Comment 4

[Magnus Melin [:mkmelin]]

Yes please.

Comment 5

[:aceman]

Attachment: patch v2

OK. Try run: https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=5cea96548d7bae9d2c415059e3eb266a4e616d24

Comment 6

[Magnus Melin [:mkmelin]]

Comment on attachment 8741053 [details] [diff] [review]
patch v2

Review of attachment 8741053 [details] [diff] [review]:
-----------------------------------------------------------------

r=mkmelin

Comment 7

[:aceman]

Thanks.

Comment 8

[:aceman]

https://hg.mozilla.org/comm-central/rev/fa8bc44ffbb8136426fbe814c5794b435fad8a5e