Commit b7e32e00 authored by Haik Aftandilian's avatar Haik Aftandilian Committed by Georg Koppen
Browse files

Bug 1344106 - Remove Linux todos() now that Linux sandboxing is riding the trains. r=haik 

MozReview-Commit-ID: 9tI2S6fEYkD

--HG--
extra : rebase_source : 0a5d00f8498861e7ea281e527b2be6b2c4e472d6
parent 4b859d5c

security/sandbox/test/browser_content_sandbox_fs.js

+0 −20
Original line number Diff line number Diff line
@@ -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) {

security/sandbox/test/browser_content_sandbox_syscalls.js

+1 −21
Original line number Diff line number Diff line
@@ -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) {