Use mochitest manifests in dom/imptests

RESOLVED FIXED in mozilla29

Status

()

RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: gps, Assigned: Ms2ger)

Tracking

Trunk
mozilla29
Points:
---
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 1 obsolete attachment)

(Reporter)

Description

5 years ago
dom/imptests should be converted to use manifests for mochitests.
(Reporter)

Comment 1

5 years ago
Created attachment 814184 [details] [diff] [review]
Use mochitest manifests in dom/imptests

I only converted editing b/c my internet connection sucks.

I changed things so we only generate a single directory for the build
system.

I still need to fix importFailures.py.

Kinda interested what Ms2ger has to say...
(Reporter)

Updated

5 years ago
Assignee: nobody → gps
(Assignee)

Comment 2

5 years ago
Comment on attachment 814184 [details] [diff] [review]
Use mochitest manifests in dom/imptests

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

Did you test with py3 too?
Attachment #814184 - Flags: feedback?(Ms2ger)
(Assignee)

Comment 3

5 years ago
Comment on attachment 814184 [details] [diff] [review]
Use mochitest manifests in dom/imptests

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

Do you have time to finish this or should I?

::: dom/imptests/editing/conformancetest/test_event.html
@@ -1,3 @@
>  <!doctype html>
>  <title>Editing event tests</title>
> -<style>body { font-family: serif }</style>

Revert this

::: dom/imptests/importTestsuite.py
@@ +107,5 @@
>  
>          reftestfiles = extractReftestFiles(d["reftests"])
>  
>          for mochitest in d["mochitests"]:
> +            # Tests sometimes reference URLs for support files. We rewrite

This is a bug in the editing tests only, and these are unmaintained, so I'd rather not add this code.

@@ +153,5 @@
>                  result = writeBuildFiles.substReftestList("importTestsuite.py",
>                      d["reftests"])
>                  fh.write(result)
>  
> +    with open(dest + '/mochitest.ini', 'w') as fh:

So everything goes into a single .ini? Then we should remove foo.mozbuild and all the Makefiles and moz.builds in the subdirs.

::: dom/imptests/writeBuildFiles.py
@@ +9,4 @@
>  
> +mochitest_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
> +[DEFAULT]
> +support-files = ${supportfiles}

Add \n${tests} here, rather than just appending below.
Attachment #814184 - Flags: feedback?(Ms2ger) → feedback+
(Assignee)

Updated

5 years ago
Flags: needinfo?(gps)
(Reporter)

Comment 4

5 years ago
I did not test with Python 3.

If you want to finish this, I would be thrilled.
Flags: needinfo?(gps)
(Assignee)

Updated

5 years ago
Assignee: gps → Ms2ger
(Assignee)

Comment 5

5 years ago
Created attachment 8355749 [details] [diff] [review]
Part a: tests
Attachment #814184 - Attachment is obsolete: true
Attachment #8355749 - Flags: review?(gps)
(Assignee)

Comment 6

5 years ago
Created attachment 8355750 [details] [diff] [review]
Part b: failures
Attachment #8355750 - Flags: review?(gps)
(Reporter)

Comment 7

5 years ago
Comment on attachment 8355749 [details] [diff] [review]
Part a: tests

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

Killing all the now-empty directories made me weep with joy.

::: dom/imptests/importTestsuite.py
@@ +138,5 @@
> +    with open(manifest_path, 'w') as fh:
> +        result = writeBuildFiles.substManifest('importTestsuite.py',
> +            all_mochitests, all_support)
> +        fh.write(result)
> +    subprocess.check_call(["hg", "add", manifest_path])

Some people make take exception with the hardcoding of hg here. I don't see it in the original patch. Perhaps best to leave as a follow-up.
Attachment #8355749 - Flags: review?(gps) → review+
(Reporter)

Comment 8

5 years ago
Comment on attachment 8355750 [details] [diff] [review]
Part b: failures

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

Beautiful.
Attachment #8355750 - Flags: review?(gps) → review+
(Assignee)

Comment 9

5 years ago
https://hg.mozilla.org/mozilla-central/rev/b0f69426a5a2
https://hg.mozilla.org/mozilla-central/rev/a4769f7058da
Status: NEW → RESOLVED
Last Resolved: 5 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → mozilla29
You need to log in before you can comment on or make changes to this bug.