From b1ef7da4b4518a8d8748508ddca79948d48ff5f1 Mon Sep 17 00:00:00 2001
From: Cosmin Sabou <csabou@mozilla.com>
Date: Thu, 2 Aug 2018 10:06:18 +0300
Subject: [PATCH] Backed out 2 changesets (bug 1337899) for linting opt failure
 on web-platform/meta/MANIFEST.json

Backed out changeset 998c36eeb67e (bug 1337899)
Backed out changeset 22c54c6cc370 (bug 1337899)
---
 testing/marionette/evaluate.js                |   4 +-
 .../tests/unit/test_execute_script.py         |   3 -
 testing/web-platform/meta/MANIFEST.json       | 161 ++++++------------
 .../webdriver/tests/execute_script/execute.py |   5 -
 4 files changed, 50 insertions(+), 123 deletions(-)

diff --git a/testing/marionette/evaluate.js b/testing/marionette/evaluate.js
index 0bcc589c8f21..9d8e278f259a 100644
--- a/testing/marionette/evaluate.js
+++ b/testing/marionette/evaluate.js
@@ -115,9 +115,7 @@ evaluate.sandbox = function(sb, script, args = [],
       src += `${ARGUMENTS}.push(rv => ${CALLBACK}(rv));`;
     }
 
-    src += `(function() {
-      ${script}
-    }).apply(null, ${ARGUMENTS})`;
+    src += `(function() { ${script} }).apply(null, ${ARGUMENTS})`;
 
     // timeout and unload handlers
     scriptTimeoutID = setTimeout(timeoutHandler, timeout);
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py b/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
index 50f7bd1f55ff..9cb53f0245f0 100644
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
@@ -349,9 +349,6 @@ class TestExecuteContent(MarionetteTestCase):
             sandbox=None)
         self.assert_is_web_element(el)
 
-    def test_comment_in_last_line(self):
-        self.marionette.execute_script(" // comment ")
-
     @skip_if_mobile("Modal dialogs not supported in Fennec")
     def test_return_value_on_alert(self):
         res = self.marionette._send_message("WebDriver:ExecuteScript", {"script": "alert()"})
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index c62303916362..838b3edae751 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -301354,11 +301354,6 @@
      {}
     ]
    ],
-   "tools/third_party/atomicwrites/tests/test_atomicwrites.py": [
-    [
-     {}
-    ]
-   ],
    "tools/third_party/atomicwrites/tox.ini": [
     [
      {}
@@ -306109,36 +306104,6 @@
      {}
     ]
    ],
-   "tools/wptserve/wptserve.egg-info/PKG-INFO": [
-    [
-     {}
-    ]
-   ],
-   "tools/wptserve/wptserve.egg-info/SOURCES.txt": [
-    [
-     {}
-    ]
-   ],
-   "tools/wptserve/wptserve.egg-info/dependency_links.txt": [
-    [
-     {}
-    ]
-   ],
-   "tools/wptserve/wptserve.egg-info/not-zip-safe": [
-    [
-     {}
-    ]
-   ],
-   "tools/wptserve/wptserve.egg-info/requires.txt": [
-    [
-     {}
-    ]
-   ],
-   "tools/wptserve/wptserve.egg-info/top_level.txt": [
-    [
-     {}
-    ]
-   ],
    "tools/wptserve/wptserve/__init__.py": [
     [
      {}
@@ -424732,7 +424697,7 @@
    "support"
   ],
   "README.md": [
-   "684f4617f689d0611b18ce1b338bfdeb8d5886b7",
+   "c1679355673513647d823585819dc7bc2c086fab",
    "support"
   ],
   "WebCryptoAPI/META.yml": [
@@ -633591,10 +633556,6 @@
    "98488e9b98308f0ec4fa578af68a4dc9c1f303a6",
    "support"
   ],
-  "tools/third_party/atomicwrites/tests/test_atomicwrites.py": [
-   "957719961800605e3c5983af0d9cd6c8eb86e2aa",
-   "support"
-  ],
   "tools/third_party/atomicwrites/tox.ini": [
    "dfadf03336ea2290b6cc3f5ab526cebcfab0745a",
    "support"
@@ -636948,7 +636909,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/testharness_webdriver.js": [
-   "7f00050fa7ed6daf89ce6af7a0e610d0e5ddc42b",
+   "22675f0703d33b0395b58b6e2b8c70c2adc76439",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js": [
@@ -637395,30 +637356,6 @@
    "8d0f25058d49205155b84d1619f06a3a7d14cf5a",
    "support"
   ],
-  "tools/wptserve/wptserve.egg-info/PKG-INFO": [
-   "3aa7fa7c5f14594e789a5c3acd7391150897feac",
-   "support"
-  ],
-  "tools/wptserve/wptserve.egg-info/SOURCES.txt": [
-   "8645726d4797a2634f151e5448f9563872e17862",
-   "support"
-  ],
-  "tools/wptserve/wptserve.egg-info/dependency_links.txt": [
-   "8b137891791fe96927ad78e64b0aad7bded08bdc",
-   "support"
-  ],
-  "tools/wptserve/wptserve.egg-info/not-zip-safe": [
-   "8b137891791fe96927ad78e64b0aad7bded08bdc",
-   "support"
-  ],
-  "tools/wptserve/wptserve.egg-info/requires.txt": [
-   "80a398a71f06bc56f4e1970db2c8fe82a8d20ad2",
-   "support"
-  ],
-  "tools/wptserve/wptserve.egg-info/top_level.txt": [
-   "f800ea081e43d57f138fe5b5fccab23dd582fc9c",
-   "support"
-  ],
   "tools/wptserve/wptserve/__init__.py": [
    "a286bfe0b3b718d3acb033d019ce955bfc68b210",
    "support"
@@ -641404,7 +641341,7 @@
    "support"
   ],
   "webdriver/tests/accept_alert/accept.py": [
-   "a111f103bf142b4041f2a8d1c6017de79b54560e",
+   "ef52b036c4919ca11814ff3fdb0bb14f02bb1310",
    "wdspec"
   ],
   "webdriver/tests/actions/__init__.py": [
@@ -641420,7 +641357,7 @@
    "wdspec"
   ],
   "webdriver/tests/actions/key.py": [
-   "50c4ed9132b10cf63ad515bbfcbd30970b2c1974",
+   "04d46652c1a40635eca8319e9c5227cd345b41fe",
    "wdspec"
   ],
   "webdriver/tests/actions/key_shortcuts.py": [
@@ -641432,7 +641369,7 @@
    "wdspec"
   ],
   "webdriver/tests/actions/mouse.py": [
-   "ca8bffceb71ff9621ae3359024c8d55ff17f7478",
+   "acc8d9ef805e7418072f7b570dc1474c8afaa0ae",
    "wdspec"
   ],
   "webdriver/tests/actions/mouse_dblclick.py": [
@@ -641480,7 +641417,7 @@
    "support"
   ],
   "webdriver/tests/add_cookie/add.py": [
-   "49b1d68e7d2baa5086d0b945e9d005c2d86234ea",
+   "5608cb81e0a70f88b694abbd4b50d2c81f363b8d",
    "wdspec"
   ],
   "webdriver/tests/back/__init__.py": [
@@ -641488,7 +641425,7 @@
    "support"
   ],
   "webdriver/tests/back/back.py": [
-   "0f94ab431ae012b0abc8406f6d372a6fafcf8048",
+   "0ecfccc193c6cef56ebe075d0bd10da110fd3803",
    "wdspec"
   ],
   "webdriver/tests/back/conftest.py": [
@@ -641504,7 +641441,7 @@
    "support"
   ],
   "webdriver/tests/close_window/close.py": [
-   "f4e3b0481d3b3cbc93ba8b44c639934cf8eef9de",
+   "57f52c1b9feb92bf604283fe51ace9e244c4b80a",
    "wdspec"
   ],
   "webdriver/tests/close_window/user_prompts.py": [
@@ -641512,7 +641449,7 @@
    "wdspec"
   ],
   "webdriver/tests/conftest.py": [
-   "c39671797f6bdf176d6b5d20b13412ee3a92cee4",
+   "debf6fc5bc20935257bb4599b41f9ff89a086cec",
    "support"
   ],
   "webdriver/tests/delete_all_cookies/__init__.py": [
@@ -641520,7 +641457,7 @@
    "support"
   ],
   "webdriver/tests/delete_all_cookies/delete.py": [
-   "e0947b6a75724ac8e298d09d77ae940ea82e98d9",
+   "363797086c9222c1a3d54b83ef172096c4c0771c",
    "wdspec"
   ],
   "webdriver/tests/delete_cookie/__init__.py": [
@@ -641528,7 +641465,7 @@
    "support"
   ],
   "webdriver/tests/delete_cookie/delete.py": [
-   "0b6adade156cecdfacf9f58be07bf5f697329124",
+   "2e79c9ba8e2ced03ef6a62211bf3f1add4730f9d",
    "wdspec"
   ],
   "webdriver/tests/delete_cookie/user_prompts.py": [
@@ -641548,7 +641485,7 @@
    "support"
   ],
   "webdriver/tests/dismiss_alert/dismiss.py": [
-   "c0efc38b47fd8b5d3d9fcf89a4dd803a9d38ec2f",
+   "c2d9ad340345ff370c1ad674b4b35efea2d5f3f0",
    "wdspec"
   ],
   "webdriver/tests/element_clear/__init__.py": [
@@ -641556,7 +641493,7 @@
    "support"
   ],
   "webdriver/tests/element_clear/clear.py": [
-   "bc74af4b61624d2e9d155ef9438043e09dbf1622",
+   "a882ba7d04ffbf8632e2d44a72c2a39b035eea7c",
    "wdspec"
   ],
   "webdriver/tests/element_click/__init__.py": [
@@ -641568,7 +641505,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_click/click.py": [
-   "4076a1a27c6635b6ae1ec111ead80cfadbde35ba",
+   "ca8940c7c702a072cda5d5aeec5f3b080149c11a",
    "wdspec"
   ],
   "webdriver/tests/element_click/file_upload.py": [
@@ -641604,11 +641541,11 @@
    "support"
   ],
   "webdriver/tests/element_send_keys/__init__.py": [
-   "a7facf6fcf70309251757e3fb90b89255e13133f",
+   "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
   ],
   "webdriver/tests/element_send_keys/conftest.py": [
-   "17bdd162a772bb0a5a4d14a2c2627a25ded9eca3",
+   "54fd9d9dc01771804c025cf3d771b3f2d9c4f758",
    "support"
   ],
   "webdriver/tests/element_send_keys/content_editable.py": [
@@ -641616,11 +641553,11 @@
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/events.py": [
-   "41b00ef37fa24154231a485bbc45da036f40e717",
+   "01c6e0924a45fa8ef51b830b8122ad851cec0b0e",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/file_upload.py": [
-   "d1a8b81da78e9f809d36fa68b4f2d5acee73c615",
+   "0f2d85c3e3f2c78f8f155928d4725a64f740c17d",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/form_controls.py": [
@@ -641636,7 +641573,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/send_keys.py": [
-   "0d281d7f5cb3c2f3386504aedd66afa6269e65d3",
+   "e086a16332c80be31b57a7317181a04fea3295be",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/user_prompts.py": [
@@ -641652,7 +641589,7 @@
    "wdspec"
   ],
   "webdriver/tests/execute_async_script/execute_async.py": [
-   "2b6e61543176ea1ba15f4c399028ceb24878e3c9",
+   "f0f10112811556da820308b8add7392dedbb76b0",
    "wdspec"
   ],
   "webdriver/tests/execute_async_script/user_prompts.py": [
@@ -641672,7 +641609,7 @@
    "wdspec"
   ],
   "webdriver/tests/execute_script/execute.py": [
-   "386afe0e1db172c310ff3aefa2bfb0078a79a966",
+   "ffff398a071a7ae6e4b9e7a3653895779c881369",
    "wdspec"
   ],
   "webdriver/tests/execute_script/json_serialize_windowproxy.py": [
@@ -641688,7 +641625,7 @@
    "support"
   ],
   "webdriver/tests/find_element/find.py": [
-   "ad25e78e9e47fa7ef45bbd1546eae9c7da78f436",
+   "7563179e2eacf034833c526b4b365759bad0a6f2",
    "wdspec"
   ],
   "webdriver/tests/find_element_from_element/__init__.py": [
@@ -641696,7 +641633,7 @@
    "support"
   ],
   "webdriver/tests/find_element_from_element/find.py": [
-   "d44fbb3957bc7b3e0e47e0016ffae3d3bfdf3813",
+   "d5713b36aee6acf6e42ff85bc97fca989265d136",
    "wdspec"
   ],
   "webdriver/tests/find_elements/__init__.py": [
@@ -641704,7 +641641,7 @@
    "support"
   ],
   "webdriver/tests/find_elements/find.py": [
-   "f6856e9ed6ed45fd6f40008ba4ee0309aff0d282",
+   "1dac2a34a2ee3a460158f218eadab0542fc9f92b",
    "wdspec"
   ],
   "webdriver/tests/find_elements_from_element/__init__.py": [
@@ -641712,7 +641649,7 @@
    "support"
   ],
   "webdriver/tests/find_elements_from_element/find.py": [
-   "bcc18642c8fd86285be4ab2520b6d16aeb516f19",
+   "d24d45a7a44eab667908d854a7dc9ef55b883651",
    "wdspec"
   ],
   "webdriver/tests/forward/__init__.py": [
@@ -641724,7 +641661,7 @@
    "support"
   ],
   "webdriver/tests/forward/forward.py": [
-   "a8c7e00b88dbf38db2e31f139e0e3853cc11a47a",
+   "17d4c56ed56b217bbcdddd10f96faf5afb77ebfa",
    "wdspec"
   ],
   "webdriver/tests/forward/user_prompts.py": [
@@ -641736,7 +641673,7 @@
    "support"
   ],
   "webdriver/tests/fullscreen_window/fullscreen.py": [
-   "5391114c67676ddf2e1aa907d1bd00da68edbe2f",
+   "3a7e4fa7b1d21a391ee0eee198483f4e51256fc7",
    "wdspec"
   ],
   "webdriver/tests/fullscreen_window/user_prompts.py": [
@@ -641748,7 +641685,7 @@
    "support"
   ],
   "webdriver/tests/get_active_element/get.py": [
-   "ac4f14d37c0b9b8cf4afa1d1af4ce1c8027c77c9",
+   "d13effb81f40f5463e2c4ffd6ea508c03f1e0e31",
    "wdspec"
   ],
   "webdriver/tests/get_alert_text/__init__.py": [
@@ -641756,7 +641693,7 @@
    "support"
   ],
   "webdriver/tests/get_alert_text/get.py": [
-   "2327abce3a4d266f0d14d8929c2ba58fedd3e441",
+   "167991b5ccbb9d3f08969399d1bc44f3bc082050",
    "wdspec"
   ],
   "webdriver/tests/get_current_url/__init__.py": [
@@ -641764,7 +641701,7 @@
    "support"
   ],
   "webdriver/tests/get_current_url/get.py": [
-   "2758ba35474e508bb495579aa9e443781da496e6",
+   "843b426b937b3df5bf70985926f6174e2c135b6a",
    "wdspec"
   ],
   "webdriver/tests/get_current_url/user_prompts.py": [
@@ -641772,7 +641709,7 @@
    "wdspec"
   ],
   "webdriver/tests/get_element_attribute/get.py": [
-   "02a155bcee6626037f424fbf387458ea46e6c206",
+   "3fcc01a7ffa4f056a8b80c35c1217f37ea6bf9ca",
    "wdspec"
   ],
   "webdriver/tests/get_element_property/__init__.py": [
@@ -641780,7 +641717,7 @@
    "support"
   ],
   "webdriver/tests/get_element_property/get.py": [
-   "fde0f2a0cd6dd89b59287510f7049ceabac8d371",
+   "f8df2822a6c3a730726c83734f37e550c2680d00",
    "wdspec"
   ],
   "webdriver/tests/get_element_property/user_prompts.py": [
@@ -641792,7 +641729,7 @@
    "support"
   ],
   "webdriver/tests/get_element_tag_name/get.py": [
-   "d705ae1118f13c2472b6fa4b1c2fc44bb4967ec2",
+   "a83ac2594ba60ad545aec36cc8973164d98e4a37",
    "wdspec"
   ],
   "webdriver/tests/get_element_tag_name/user_prompts.py": [
@@ -641804,7 +641741,7 @@
    "support"
   ],
   "webdriver/tests/get_element_text/get.py": [
-   "9f660308bc29725299a083b0b71db80ed26ff8e8",
+   "4d1eb18a352f49180cde241fef8dd4dd77fd1088",
    "wdspec"
   ],
   "webdriver/tests/get_named_cookie/__init__.py": [
@@ -641812,7 +641749,7 @@
    "support"
   ],
   "webdriver/tests/get_named_cookie/get.py": [
-   "915f26c801b5a69e1ed2a2d9f73fe0d862bf525a",
+   "cbf7195bad8f4caa06a5f48998634e3fb4a1a6de",
    "wdspec"
   ],
   "webdriver/tests/get_timeouts/__init__.py": [
@@ -641828,7 +641765,7 @@
    "support"
   ],
   "webdriver/tests/get_title/get.py": [
-   "ed5b401c564ec7375b3be8ebd9124388f40062a7",
+   "3b1673c3dd59efd0a6efe324e7f664dd2864f590",
    "wdspec"
   ],
   "webdriver/tests/get_title/user_prompts.py": [
@@ -641840,7 +641777,7 @@
    "support"
   ],
   "webdriver/tests/get_window_rect/get.py": [
-   "ee2c9eefd3f4ff81ea1cb8f33be58cc17f332030",
+   "e4f01dc362b3a88de872daac137409194e5167fe",
    "wdspec"
   ],
   "webdriver/tests/get_window_rect/user_prompts.py": [
@@ -641856,7 +641793,7 @@
    "support"
   ],
   "webdriver/tests/is_element_selected/selected.py": [
-   "76361e50563d1589d867d7b7ddd45a287ea1eb6c",
+   "0e76e2349a83b801204e9c3801a90cbf8225a123",
    "wdspec"
   ],
   "webdriver/tests/is_element_selected/user_prompts.py": [
@@ -641868,7 +641805,7 @@
    "support"
   ],
   "webdriver/tests/maximize_window/maximize.py": [
-   "77af0b99169a91eb99ff81236e6fa61a7f1399f7",
+   "4ae8cab01995450f400fa93459d4b4b63637d10c",
    "wdspec"
   ],
   "webdriver/tests/maximize_window/user_prompts.py": [
@@ -641880,7 +641817,7 @@
    "support"
   ],
   "webdriver/tests/minimize_window/minimize.py": [
-   "be161a62e20191d41cd83ea2289cc5954af4892f",
+   "5c41b02fde6359d981fde7ff942e45a9d71ce5fc",
    "wdspec"
   ],
   "webdriver/tests/minimize_window/user_prompts.py": [
@@ -641892,7 +641829,7 @@
    "support"
   ],
   "webdriver/tests/navigate_to/navigate.py": [
-   "9ac1be00b84eeae73aec8a1facb43b329bae6310",
+   "7f5414b2b0fd8df52174a784743c22362122a034",
    "wdspec"
   ],
   "webdriver/tests/new_session/__init__.py": [
@@ -641940,7 +641877,7 @@
    "support"
   ],
   "webdriver/tests/page_source/source.py": [
-   "0deb1b46488f9b6e79e98931fca54e6b5f693c2a",
+   "97e4e1eff255c2209cf36bc7885022acbcf9963f",
    "wdspec"
   ],
   "webdriver/tests/refresh/__init__.py": [
@@ -641948,7 +641885,7 @@
    "support"
   ],
   "webdriver/tests/refresh/refresh.py": [
-   "30bd369bba1bd9395cd70f0d6b8b70a3a955cb5d",
+   "5d01a9157492ecece4af99d2424bc259a510ed64",
    "wdspec"
   ],
   "webdriver/tests/refresh/user_prompts.py": [
@@ -641960,7 +641897,7 @@
    "support"
   ],
   "webdriver/tests/send_alert_text/send.py": [
-   "9d4532a190c717ad7997a5b9ccb6d8d32a2cb1fc",
+   "06262b82c94944f226f416af0999d066aef9a15a",
    "wdspec"
   ],
   "webdriver/tests/set_timeouts/__init__.py": [
@@ -641976,7 +641913,7 @@
    "support"
   ],
   "webdriver/tests/set_window_rect/set.py": [
-   "f7965681744745458296864fda6718ebe4b75a26",
+   "114ddff18d44cba21f62f3c4d5fc8d34936321d3",
    "wdspec"
   ],
   "webdriver/tests/set_window_rect/user_prompts.py": [
@@ -642000,7 +641937,7 @@
    "support"
   ],
   "webdriver/tests/support/fixtures.py": [
-   "b4a29968b58cac2dfbe6b2ee28abdc3501cf4e01",
+   "775b1735e7d4076402506e12d6ecf7b24899e9a0",
    "support"
   ],
   "webdriver/tests/support/http_request.py": [
@@ -642024,7 +641961,7 @@
    "support"
   ],
   "webdriver/tests/switch_to_frame/switch.py": [
-   "403047958665981f5509e370e38897b8a463e2a7",
+   "955bd6b936d6d28d33a1152b33f063e889b0b3fb",
    "wdspec"
   ],
   "webdriver/tests/switch_to_parent_frame/__init__.py": [
@@ -642032,7 +641969,7 @@
    "support"
   ],
   "webdriver/tests/switch_to_parent_frame/switch.py": [
-   "6b9c90f0cd83e2c916da989a81ed206618fbaf4a",
+   "c5234727f2c358bbc815ddf5f3d89fc116cfc109",
    "wdspec"
   ],
   "webdriver/tests/switch_to_window/__init__.py": [
@@ -642892,7 +642829,7 @@
    "testharness"
   ],
   "webrtc/RTCRtpTransceiver.https.html": [
-   "f3b67632f2da94c8a01f95c829ffe129231835e0",
+   "2bba7c4641c64b46b6e6a80c11e9ff8a6a30118e",
    "testharness"
   ],
   "webrtc/RTCSctpTransport-constructor.html": [
diff --git a/testing/web-platform/tests/webdriver/tests/execute_script/execute.py b/testing/web-platform/tests/webdriver/tests/execute_script/execute.py
index 386afe0e1db1..632d4ed8b3fd 100644
--- a/testing/web-platform/tests/webdriver/tests/execute_script/execute.py
+++ b/testing/web-platform/tests/webdriver/tests/execute_script/execute.py
@@ -19,11 +19,6 @@ def test_no_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_ending_comment(session):
-    response = execute_script(session, "return 1; // foo")
-    assert_success(response, 1)
-
-
 @pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
 def test_abort_by_user_prompt(session, dialog_type):
     response = execute_script(