Bug 1337667 - Un-skip xpcshell selftests for stylo now that they're passing.
MozReview-Commit-ID: JwvIhSkgNa4
--- a/testing/xpcshell/selftest.py
+++ b/testing/xpcshell/selftest.py
@@ -561,18 +561,16 @@ tail =
log_lines = self.log.getvalue().splitlines()
line_pat = "#\d\d:"
unknown_pat = "#\d\d\: \?\?\?\[.* \+0x[a-f0-9]+\]"
self.assertFalse(any(re.search(unknown_pat, line) for line in log_lines),
"An stack frame without symbols was found in\n%s" % pprint.pformat(log_lines))
self.assertTrue(any(re.search(line_pat, line) for line in log_lines),
"No line resembling a stack frame was found in\n%s" % pprint.pformat(log_lines))
- @unittest.skipIf(mozinfo.info.get('stylo'),
- 'failing on stylo for some reason') # bug 1337667
def testChildPass(self):
"""
Check that a simple test running in a child process passes.
"""
self.writeFile("test_pass.js", SIMPLE_PASSING_TEST)
self.writeFile("test_child_pass.js", CHILD_TEST_PASSING)
self.writeManifest(["test_child_pass.js"])
@@ -581,19 +579,16 @@ tail =
self.assertEquals(1, self.x.passCount)
self.assertEquals(0, self.x.failCount)
self.assertEquals(0, self.x.todoCount)
self.assertInLog(TEST_PASS_STRING)
self.assertInLog("CHILD-TEST-STARTED")
self.assertInLog("CHILD-TEST-COMPLETED")
self.assertNotInLog(TEST_FAIL_STRING)
-
- @unittest.skipIf(mozinfo.info.get('stylo'),
- 'failing on stylo for some reason') # bug 1337667
def testChildFail(self):
"""
Check that a simple failing test running in a child process fails.
"""
self.writeFile("test_fail.js", SIMPLE_FAILING_TEST)
self.writeFile("test_child_fail.js", CHILD_TEST_FAILING)
self.writeManifest(["test_child_fail.js"])
@@ -602,18 +597,16 @@ tail =
self.assertEquals(0, self.x.passCount)
self.assertEquals(1, self.x.failCount)
self.assertEquals(0, self.x.todoCount)
self.assertInLog(TEST_FAIL_STRING)
self.assertInLog("CHILD-TEST-STARTED")
self.assertInLog("CHILD-TEST-COMPLETED")
self.assertNotInLog(TEST_PASS_STRING)
- @unittest.skipIf(mozinfo.info.get('stylo'),
- 'failing on stylo for some reason') # bug 1337667
def testChildHang(self):
"""
Check that incomplete output from a child process results in a
test failure.
"""
self.writeFile("test_pass.js", SIMPLE_PASSING_TEST)
self.writeFile("test_child_hang.js", CHILD_TEST_HANG)
self.writeManifest(["test_child_hang.js"])
@@ -623,18 +616,16 @@ tail =
self.assertEquals(0, self.x.passCount)
self.assertEquals(1, self.x.failCount)
self.assertEquals(0, self.x.todoCount)
self.assertInLog(TEST_FAIL_STRING)
self.assertInLog("CHILD-TEST-STARTED")
self.assertNotInLog("CHILD-TEST-COMPLETED")
self.assertNotInLog(TEST_PASS_STRING)
- @unittest.skipIf(mozinfo.info.get('stylo'),
- 'failing on stylo for some reason') # bug 1337667
def testChild(self):
"""
Checks that calling do_load_child_test_harness without run_test_in_child
results in a usable test state. This test has a spurious failure when
run using |mach python-test|. See bug 1103226.
"""
self.writeFile("test_child_assertions.js", CHILD_HARNESS_SIMPLE)
self.writeManifest(["test_child_assertions.js"])
@@ -1320,18 +1311,16 @@ add_test({
self.assertTestResult(True)
self.assertEquals(1, self.x.testCount)
self.assertEquals(1, self.x.passCount)
self.assertEquals(0, self.x.failCount)
self.assertEquals(0, self.x.todoCount)
self.assertInLog(TEST_PASS_STRING)
self.assertNotInLog(TEST_FAIL_STRING)
- @unittest.skipIf(mozinfo.info.get('stylo'),
- 'failing on stylo for some reason') # bug 1337667
def testChildMozinfo(self):
"""
Check that mozinfo.json is loaded in child process
"""
self.writeFile("test_mozinfo.js", LOAD_MOZINFO)
self.writeFile("test_child_mozinfo.js", CHILD_MOZINFO)
self.writeManifest(["test_child_mozinfo.js"])
self.assertTestResult(True)