From e98c424437df5b81f4df99e3f10595c69164f691 Mon Sep 17 00:00:00 2001
From: Trevor Rowbotham <smokey101stair@gmail.com>
Date: Wed, 9 Sep 2015 13:44:00 +0200
Subject: [PATCH] Bug 1180901 - Test that an extension can be installed when a
 locked file exists in the extensions trash directory as long as the extension
 being installed does not touch the locked file. r=mossop

---
 .../test/xpcshell/test_bug1180901_2.js        | 60 +++++++++++++++++++
 .../test/xpcshell/xpcshell-shared.ini         |  2 +
 .../extensions/test/xpcshell/xpcshell.ini     |  1 +
 3 files changed, 63 insertions(+)
 create mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js
new file mode 100644
index 00000000000..33062f26656
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js
@@ -0,0 +1,60 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+  startupManager();
+  run_next_test();
+}
+
+add_task(function* () {
+  let profileDir = OS.Constants.Path.profileDir;
+  let trashDir = OS.Path.join(profileDir, "extensions", "trash");
+  let testFile = OS.Path.join(trashDir, "test.txt");
+
+  yield OS.File.makeDir(trashDir, {
+    from: profileDir,
+    ignoreExisting: true
+  });
+
+  let trashDirExists = yield OS.File.exists(trashDir);
+  ok(trashDirExists, "trash directory should have been created");
+
+  let file = yield OS.File.open(testFile, {create: true}, {winShare: 0});
+  let fileExists = yield OS.File.exists(testFile);
+  ok(fileExists, "test.txt should have been created in " + trashDir);
+
+  let promiseInstallStatus = new Promise((resolve, reject) => {
+    let listener = {
+      onInstallFailed: function() {
+        AddonManager.removeInstallListener(listener);
+        reject("extension installation should not have failed");
+      },
+      onInstallEnded: function() {
+        AddonManager.removeInstallListener(listener);
+        ok(true, "extension installation should not have failed");
+        resolve();
+      }
+    };
+
+    AddonManager.addInstallListener(listener);
+  });
+
+  yield promiseInstallAllFiles([do_get_addon("test_bootstrap1_1")]);
+
+  // The testFile should still exist at this point because we have not
+  // yet closed the file handle and as a result, Windows cannot remove it.
+  fileExists = yield OS.File.exists(testFile);
+  ok(fileExists, "test.txt should still exist");
+
+  // Wait for the AddonManager to tell us if the installation of the extension
+  // succeeded or not.
+  yield promiseInstallStatus;
+
+  // Cleanup
+  yield promiseShutdownManager();
+  yield file.close();
+  yield OS.File.remove(testFile);
+  yield OS.File.removeDir(trashDir);
+});
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
index ba369480b4d..fc7980642a9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
@@ -294,5 +294,7 @@ run-sequentially = Uses global XCurProcD dir.
 [test_sourceURI.js]
 [test_webextension.js]
 [test_bootstrap_globals.js]
+[test_bug1180901_2.js]
+skip-if = os != "win"
 [test_bug1180901.js]
 skip-if = os != "win"
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
index a87c4ac399e..7fdbe2ee1b6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -30,4 +30,5 @@ skip-if = appname != "firefox"
 
 
 
+
 [include:xpcshell-shared.ini]