From def3ad418477f5910ed958451493143dfb9927f1 Mon Sep 17 00:00:00 2001 From: Dave Townsend Date: Wed, 27 Jan 2010 11:43:48 -0800 Subject: [PATCH] Backing out bug 541520 due to intermittent test failures --- .../mozapps/extensions/nsExtensionManager.js | 2 +- .../test/unit/data/test_bug541420.xpi | Bin 602 -> 0 bytes .../extensions/test/unit/test_bug541420.js | 70 ------------------ 3 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 toolkit/mozapps/extensions/test/unit/data/test_bug541420.xpi delete mode 100644 toolkit/mozapps/extensions/test/unit/test_bug541420.js diff --git a/toolkit/mozapps/extensions/nsExtensionManager.js b/toolkit/mozapps/extensions/nsExtensionManager.js index 3064a6517bdb..1da189aa2875 100644 --- a/toolkit/mozapps/extensions/nsExtensionManager.js +++ b/toolkit/mozapps/extensions/nsExtensionManager.js @@ -1678,7 +1678,7 @@ function safeInstallOperation(itemID, installLocation, file) { continue; zipReader.extract(entryName, target); - target.permissions |= FileUtils.PERMS_FILE; + target.permissions = FileUtils.PERMS_FILE; } } catch (e) { diff --git a/toolkit/mozapps/extensions/test/unit/data/test_bug541420.xpi b/toolkit/mozapps/extensions/test/unit/data/test_bug541420.xpi deleted file mode 100644 index d5d1e91da9793d1508a422ece91768ee0d632431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 602 zcmWIWW@Zs#U}E54Sn6YD^ZEtzJS9d31|KE{25tr!hRnR;lEj=Gy`q$~&=5`rX17O? z-XL6B!Og(P@)f8OsF{JGHRxc_VFiJ`&$SI~gD*+&pS=(=_ttE2{(IYbeP=RGYV7T- z+uLH6yZGFR-rDzXt9Ku`zBlZNbA)>K<}UHiDske0NA8m4%xvln!$qih0o)c0E2wlY{q?%E=iQnybXBt(|_j z?bth&_m>1qS!ws`9b47xR~Kcr{v`3PS`VJ(jKlBUIhWK_1Q)XTtD6kd$Q%m1^p|B zvVD0iKi^;4v5zqT7|dM2kYZqP^fj{qGoS<;Fqo4v^Ad|H!6BUaIMN%0(Ly-Dn~_P5 z8COI}fXxEN2E&p@5ECWZSRv7d)j(WMf*1%g>TP2>&|H`Ufo5TK94i}0EfWyV1=7nw HE@1!w_6Ewk diff --git a/toolkit/mozapps/extensions/test/unit/test_bug541420.js b/toolkit/mozapps/extensions/test/unit/test_bug541420.js deleted file mode 100644 index 6cefe6fbf9a8..000000000000 --- a/toolkit/mozapps/extensions/test/unit/test_bug541420.js +++ /dev/null @@ -1,70 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Mozilla Corporation. - * - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Dave Townsend - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL - * - * ***** END LICENSE BLOCK ***** - */ - -function run_test() { - createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1"); - - startupEM(); - - gEM.installItemFromFile(do_get_file("data/test_bug541420.xpi"), - NS_INSTALL_LOCATION_APPPROFILE); - - restartEM(); - do_check_neq(gEM.getItemForID("bug541420@tests.mozilla.org"), null); - - var il = gEM.getInstallLocation("bug541420@tests.mozilla.org"); - var file = il.getItemFile("bug541420@tests.mozilla.org", "binary"); - do_check_true(file.exists()); - do_check_true(file.isReadable()); - do_check_true(file.isWritable()); - - // We don't understand executable permissions on Windows since we don't - // support NTFS permissions so we don't need to test there. OSX's isExecutable - // only tests if the file is an application so it is better to just check the - // raw permission bits - if (!("nsIWindowsRegKey" in Components.interfaces)) { - if ((file.permissions & 0111) == 0) - do_throw("File should have been executable, permissions were " + file.permissions.toString(8)); - } - - gEM.uninstallItem("bug541420@tests.mozilla.org"); - - restartEM(); - do_check_eq(gEM.getItemForID("bug541420@tests.mozilla.org"), null); -}