diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-08 18:56:39 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-08 18:56:39 -0400 |
| commit | 6968a3e4021dbd241c0193b47e8abf49c9281506 (patch) | |
| tree | cd608537c0787f280f8600beb2399ad0de94668d /testing | |
| parent | 015f385ecb39218830fc6f9e1fb81e34e1c21901 (diff) | |
| parent | 964c9830fa956249e5f3f3e30bf5d2d307ca3572 (diff) | |
| download | UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar.gz UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar.lz UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar.xz UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/web-platform/tests/webstorage/storage_string_conversion.html | 6 | ||||
| -rwxr-xr-x | testing/xpcshell/selftest.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/web-platform/tests/webstorage/storage_string_conversion.html b/testing/web-platform/tests/webstorage/storage_string_conversion.html index 518b27521..c76eddfec 100644 --- a/testing/web-platform/tests/webstorage/storage_string_conversion.html +++ b/testing/web-platform/tests/webstorage/storage_string_conversion.html @@ -22,21 +22,21 @@ storage.b = 0; assert_equals(storage.b, "0"); storage.c = function(){}; - assert_equals(storage.c, "function (){}"); + assert_equals(storage.c, "function(){}"); storage.setItem('d', null); assert_equals(storage.d, "null"); storage.setItem('e', 0); assert_equals(storage.e, "0"); storage.setItem('f', function(){}); - assert_equals(storage.f, "function (){}"); + assert_equals(storage.f, "function(){}"); storage['g'] = null; assert_equals(storage.g, "null"); storage['h'] = 0; assert_equals(storage.h, "0"); storage['i'] = function(){}; - assert_equals(storage.f, "function (){}"); + assert_equals(storage.f, "function(){}"); }, name + " only stores strings"); }); diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py index 856f505fc..071ab5eda 100755 --- a/testing/xpcshell/selftest.py +++ b/testing/xpcshell/selftest.py @@ -1162,7 +1162,7 @@ add_test({ self.assertTestResult(False) self.assertInLog(TEST_FAIL_STRING) - self.assertInLog("TypeError: generator function run_test returns a value at") + self.assertInLog("TypeError: generator function can't return a value at") self.assertInLog("test_error.js:4") self.assertNotInLog(TEST_PASS_STRING) |