[tor-commits] [tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1344106 - Remove Linux todos() now that Linux sandboxing is riding the trains. r=haik

[gk at torproject.org]

commit fcf32e4bdade5686f7dd3ca503d45fbfc6d56d2d
Author: Haik Aftandilian <haftandilian at mozilla.com>
Date:   Fri Mar 3 09:50:29 2017 +0100

    Bug 1344106 - Remove Linux todos() now that Linux sandboxing is riding the trains. r=haik
    
    MozReview-Commit-ID: 9tI2S6fEYkD
    
    --HG--
    extra : rebase_source : 0a5d00f8498861e7ea281e527b2be6b2c4e472d6
---
 .../sandbox/test/browser_content_sandbox_fs.js     | 20 --------------------
 .../test/browser_content_sandbox_syscalls.js       | 22 +---------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/security/sandbox/test/browser_content_sandbox_fs.js b/security/sandbox/test/browser_content_sandbox_fs.js
index 946f86bb9a92..7439bd46ee53 100644
--- a/security/sandbox/test/browser_content_sandbox_fs.js
+++ b/security/sandbox/test/browser_content_sandbox_fs.js
@@ -96,25 +96,11 @@ add_task(function*() {
     prefExists = false;
   }
 
-  // Special case Linux on !isNightly
-  if (isLinux() && !isNightly()) {
-    todo(prefExists, "pref security.sandbox.content.level exists");
-    if (!prefExists) {
-      return;
-    }
-  }
-
   ok(prefExists, "pref security.sandbox.content.level exists");
   if (!prefExists) {
     return;
   }
 
-  // Special case Linux on !isNightly
-  if (isLinux() && !isNightly()) {
-    todo(level > 0, "content sandbox enabled for !nightly.");
-    return;
-  }
-
   info(`security.sandbox.content.level=${level}`);
   ok(level > 0, "content sandbox is enabled.");
   if (level == 0) {
@@ -124,12 +110,6 @@ add_task(function*() {
 
   let isFileIOSandboxed = isContentFileIOSandboxed(level);
 
-  // Special case Linux on !isNightly
-  if (isLinux() && !isNightly()) {
-    todo(isFileIOSandboxed, "content file I/O sandbox enabled for !nightly.");
-    return;
-  }
-
   // Content sandbox enabled, but level doesn't include file I/O sandboxing.
   ok(isFileIOSandboxed, "content file I/O sandboxing is enabled.");
   if (!isFileIOSandboxed) {
diff --git a/security/sandbox/test/browser_content_sandbox_syscalls.js b/security/sandbox/test/browser_content_sandbox_syscalls.js
index d56456966b8a..848b145429f2 100644
--- a/security/sandbox/test/browser_content_sandbox_syscalls.js
+++ b/security/sandbox/test/browser_content_sandbox_syscalls.js
@@ -104,7 +104,7 @@ function areContentSyscallsSandboxed(level) {
       syscallsSandboxMinLevel = 1;
       break;
     case "Linux":
-      syscallsSandboxMinLevel = 2;
+      syscallsSandboxMinLevel = 1;
       break;
     default:
       Assert.ok(false, "Unknown OS");
@@ -140,25 +140,11 @@ add_task(function*() {
     prefExists = false;
   }
 
-  // Special case Linux on !isNightly
-  if (isLinux() && !isNightly()) {
-    todo(prefExists, "pref security.sandbox.content.level exists");
-    if (!prefExists) {
-      return;
-    }
-  }
-
   ok(prefExists, "pref security.sandbox.content.level exists");
   if (!prefExists) {
     return;
   }
 
-  // Special case Linux on !isNightly
-  if (isLinux() && !isNightly()) {
-    todo(level > 0, "content sandbox enabled for !nightly.");
-    return;
-  }
-
   info(`security.sandbox.content.level=${level}`);
   ok(level > 0, "content sandbox is enabled.");
   if (level == 0) {
@@ -168,12 +154,6 @@ add_task(function*() {
 
   let areSyscallsSandboxed = areContentSyscallsSandboxed(level);
 
-  // Special case Linux on !isNightly
-  if (isLinux() && !isNightly()) {
-    todo(areSyscallsSandboxed, "content syscall sandbox enabled for !nightly.");
-    return;
-  }
-
   // Content sandbox enabled, but level doesn't include syscall sandboxing.
   ok(areSyscallsSandboxed, "content syscall sandboxing is enabled.");
   if (!areSyscallsSandboxed) {