Implementing stateful directory tracking for dtrace on OSX.

tools/isolate/trace_inputs_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import shutil
 import subprocess
 import sys
@@ skipping 40 matching lines @@
     return out
 
   @staticmethod
   def _gyp():
     return [
       '--gyp', os.path.join('data', 'trace_inputs'),
       '--product', '.',  # Not tested.
     ]
 
   def test_trace(self):
-    if sys.platform == 'linux2':
-      return self._test_trace_linux()
-    if sys.platform == 'darwin':
-      return self._test_trace_mac()
-    print 'Unsupported: %s' % sys.platform
-
-  def test_trace_gyp(self):
-    if sys.platform == 'linux2':
-      return self._test_trace_gyp_linux()
-    if sys.platform == 'darwin':
-      return self._test_trace_gyp_mac()
-    print 'Unsupported: %s' % sys.platform
-
-  def _test_trace_linux(self):
+    if sys.platform not in ('linux2', 'darwin'):
+      print 'WARNING: unsupported: %s' % sys.platform
+      return
     expected_end = [
       "Interesting: 4 reduced to 3",
       "  data/trace_inputs/",
       "  trace_inputs.py",
       "  trace_inputs_test.py",
     ]
     actual = self._execute(['trace_inputs_test.py', '--child1']).splitlines()
     self.assertTrue(actual[0].startswith('Tracing... ['))
     self.assertTrue(actual[1].startswith('Loading traces... '))
     self.assertTrue(actual[2].startswith('Total: '))
     self.assertEquals("Non existent: 0", actual[3])
     # Ignore any Unexpected part.
     # TODO(maruel): Make sure there is no Unexpected part, even in the case of
     # virtualenv usage.
     self.assertEquals(expected_end, actual[-len(expected_end):])
 
-  def _test_trace_gyp_linux(self):
+  def test_trace_gyp(self):
+    if sys.platform not in ('linux2', 'darwin'):
+      print 'WARNING: unsupported: %s' % sys.platform
+      return
     expected = (
         "{\n"
         "  'variables': {\n"
         "    'isolate_files': [\n"
         "      '<(DEPTH)/trace_inputs.py',\n"
         "      '<(DEPTH)/trace_inputs_test.py',\n"
         "    ],\n"
         "    'isolate_dirs': [\n"
         "      './',\n"
         "    ],\n"
         "  },\n"
         "},\n")
     actual = self._execute(self._gyp() + ['trace_inputs_test.py', '--child1'])
     self.assertEquals(expected, actual)
 
-  def _test_trace_mac(self):
-    # It is annoying in the case of dtrace because it requires root access.
-    # TODO(maruel): BUG: Note that child.py is missing.
-    expected = (
-      "Total: 2\n"
-      "Non existent: 0\n"
-      "Interesting: 2 reduced to 2\n"
-      "  trace_inputs.py\n"
-      "  trace_inputs_test.py\n")
-    actual = self._execute(
-        ['trace_inputs_test.py', '--child1']).splitlines(True)
-    self.assertTrue(actual[0].startswith('Tracing... ['))
-    self.assertTrue(actual[1].startswith('Loading traces... '))
-    self.assertEquals(expected, ''.join(actual[2:]))
-
-  def _test_trace_gyp_mac(self):
-    # It is annoying in the case of dtrace because it requires root access.
-    # TODO(maruel): BUG: Note that child.py is missing.
-    expected = (
-        "{\n"
-        "  'variables': {\n"
-        "    'isolate_files': [\n"
-        "      '<(DEPTH)/trace_inputs.py',\n"
-        "      '<(DEPTH)/trace_inputs_test.py',\n"
-        "    ],\n"
-        "    'isolate_dirs': [\n"
-        "    ],\n"
-        "  },\n"
-        "},\n")
-    actual = self._execute(self._gyp() + ['trace_inputs_test.py', '--child1'])
-    self.assertEquals(expected, actual)
-
 
 def child1():
   print 'child1'
   # Implicitly force file opening.
   import trace_inputs  # pylint: disable=W0612
   # Do not wait for the child to exit.
   # Use relative directory.
   subprocess.Popen(
       ['python', 'child2.py'], cwd=os.path.join('data', 'trace_inputs'))
   return 0
 
 
 def main():
   global VERBOSE
   VERBOSE = '-v' in sys.argv
   level = logging.DEBUG if VERBOSE else logging.ERROR
   logging.basicConfig(level=level)
   if len(sys.argv) == 1:
     unittest.main()
 
   if sys.argv[1] == '--child1':
     return child1()
 
   unittest.main()
 
 
 if __name__ == '__main__':
   sys.exit(main())