Commit 9e2ec4ca authored by Phil Ringnalda's avatar Phil Ringnalda
Browse files

Merge f-t to m-c

parents f9e95915 52a0fd57

toolkit/modules/FileUtils.jsm

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ this.FileUtils = { 
  MODE_APPEND   : 0x10,

  MODE_TRUNCATE : 0x20,



  PERMS_FILE      : 0644,

  PERMS_DIRECTORY : 0755,

  PERMS_FILE      : 0o644,

  PERMS_DIRECTORY : 0o755,



  /**

   * Gets a file at the specified hierarchy under a nsIDirectoryService key.

toolkit/mozapps/update/tests/chrome/chrome.ini

+4 −0
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ reason = Bug 918029 - timeout caused by copying too many files. 
[test_0097_restartNotification_stagedServiceBackground.xul]

[test_0101_background_restartNotification.xul]

[test_0102_background_restartNotification_staging.xul]

skip-if = os == 'linux'

reason = Bug 918029 - timeout caused by copying too many files.

[test_0103_background_restartNotification_stagingService.xul]

run-if = os == 'win'

reason = only Windows has the maintenance service.

[test_0111_neverButton_basic.xul]

[test_0112_neverButton_billboard.xul]

[test_0113_showNeverForVersionRemovedWithPref.xul]

toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ function runTest() { 
  let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();

  setUpdateURLOverride(url);



  setupTimer(180000); // 180 seconds



  gUP.checkForUpdates();

}

toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ function runTest() { 
  let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();

  setUpdateURLOverride(url);



  setupTimer(180000); // 180 seconds



  gAUS.notify(null);

}

toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ function runTest() { 
  let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();

  setUpdateURLOverride(url);



  setupTimer(180000); // 180 seconds



  gAUS.notify(null);

}