Rewrite isolate_smoke_test.py to increase the coverage.

tools/isolate/isolate_smoke_test.py

Index: tools/isolate/isolate_smoke_test.py
diff --git a/tools/isolate/isolate_smoke_test.py b/tools/isolate/isolate_smoke_test.py
index 727b9a1597a6407855a581635fc7d6c1f4540018..2fd64d6d2c844cd59b5e866aaa1aed60e8f52a18 100755
--- a/tools/isolate/isolate_smoke_test.py
+++ b/tools/isolate/isolate_smoke_test.py
@@ -21,6 +21,29 @@ ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 VERBOSE = False
 
 
+# Keep the list hard coded.
+EXPECTED_MODES = ('check', 'hashtable', 'remap', 'run', 'trace')
+# These are per test case, not per mode.
+RELATIVE_CWD = {
+  'fail': '.',
+  'missing_trailing_slash': '.',
+  'no_run': '.',
+  'non_existent': '.',
+  'touch_root': 'data/isolate',
+  'with_flag': '.',
+}
+DEPENDENCIES = {
+  'fail': ['fail.py'],
+  'missing_trailing_slash': [],
+  'no_run': [
+    'no_run.isolate', 'files1/test_file1.txt', 'files1/test_file2.txt',
+  ],
+  'non_existent': [],
+  'touch_root': ['data/isolate/touch_root.py', 'isolate.py'],
+  'with_flag': [
+    'with_flag.py', 'files1/test_file1.txt', 'files1/test_file2.txt',
+  ],
+}
 
 class CalledProcessError(subprocess.CalledProcessError):
   """Makes 2.6 version act like 2.7"""
@@ -35,82 +58,115 @@ class CalledProcessError(subprocess.CalledProcessError):
         'cwd=%s\n%s') % (self.cwd, self.output)
 
 
-class Isolate(unittest.TestCase):
+class IsolateBase(unittest.TestCase):
+  # To be defined by the subclass, it defines the amount of meta data saved by
+  # isolate.py for each file. Should be one of (NO_INFO, STATS_ONLY, WITH_HASH).
+  LEVEL = None
+
   def setUp(self):
     # The tests assume the current directory is the file's directory.
     os.chdir(ROOT_DIR)
     self.tempdir = tempfile.mkdtemp()
-    self.result = os.path.join(self.tempdir, 'result')
-    self.child = os.path.join('data', 'isolate', 'child.py')
-    if VERBOSE:
-      print
-    self.files = [
-      self.child,
-      os.path.join('data', 'isolate', 'files1', 'test_file1.txt'),
-      os.path.join('data', 'isolate', 'files1', 'test_file2.txt'),
-    ]
+    self.result = os.path.join(self.tempdir, 'isolate_smoke_test.result')
+    self.outdir = os.path.join(self.tempdir, 'isolated')
 
   def tearDown(self):
     shutil.rmtree(self.tempdir)
 
-  def _expected_tree(self, files):
-    self.assertEquals(sorted(files), sorted(os.listdir(self.tempdir)))
+  def _expect_no_tree(self):
+    self.assertFalse(os.path.exists(self.outdir))
+
+  def _result_tree(self):
+    actual = []
+    for root, _dirs, files in os.walk(self.outdir):
+      actual.extend(os.path.join(root, f)[len(self.outdir)+1:] for f in files)
+    return sorted(actual)
 
-  def _expected_result(self, with_hash, files, args, read_only):
+  def _expected_tree(self):
+    """Verifies the files written in the temporary directory."""
+    self.assertEquals(sorted(DEPENDENCIES[self.case()]), self._result_tree())
+
+  @staticmethod
+  def _fix_file_mode(filename, read_only):
     if sys.platform == 'win32':
-      mode = lambda _: 420
+      # Deterministic file mode for a deterministic OS.
+      return 420
     else:
       # 4 modes are supported, 0755 (rwx), 0644 (rw), 0555 (rx), 0444 (r)
       min_mode = 0444
       if not read_only:
         min_mode |= 0200
-      def mode(filename):
-        return (min_mode | 0111) if filename.endswith('.py') else min_mode
-
-    if not isinstance(files, dict):
-      # Update files to dict.
-      files = dict((unicode(f), {u'mode': mode(f)}) for f in files)
-    # Add size and timestamp.
-    files = files.copy()
-    for k, v in files.iteritems():
-      if v:
-        filestats = os.stat(k)
+      return (min_mode | 0111) if filename.endswith('.py') else min_mode
+
+  def _gen_files(self, read_only):
+    root_dir = ROOT_DIR
+    if RELATIVE_CWD[self.case()] == '.':
+      root_dir = os.path.join(root_dir, 'data', 'isolate')
+
+    files = dict((unicode(f), {}) for f in DEPENDENCIES[self.case()])
+
+    if self.LEVEL >= isolate.STATS_ONLY:
+      for k, v in files.iteritems():
+        v[u'mode'] = self._fix_file_mode(k, read_only)
+        filestats = os.stat(os.path.join(root_dir, k))
         v[u'size'] = filestats.st_size
         # Used the skip recalculating the hash. Use the most recent update
         # time.
-        v[u'timestamp'] = int(round(
-            max(filestats.st_mtime, filestats.st_ctime)))
+        v[u'timestamp'] = int(round(filestats.st_mtime))
 
+    if self.LEVEL >= isolate.WITH_HASH:
+      for filename in files:
+        # Calculate our hash.
+        h = hashlib.sha1()
+        h.update(open(os.path.join(root_dir, filename), 'rb').read())
+        files[filename][u'sha-1'] = unicode(h.hexdigest())
+    return files
+
+  def _expected_result(self, args, read_only):
+    """Verifies self.result contains the expected data."""
     expected = {
-      u'files': files,
-      u'relative_cwd': u'data/isolate',
-      u'read_only': None,
+      u'files': self._gen_files(read_only),
+      u'relative_cwd': unicode(RELATIVE_CWD[self.case()]),
+      u'read_only': read_only,
     }
     if args:
       expected[u'command'] = [u'python'] + [unicode(x) for x in args]
     else:
       expected[u'command'] = []
-    if with_hash:
-      for filename in expected[u'files']:
-        # Calculate our hash.
-        h = hashlib.sha1()
-        h.update(open(os.path.join(ROOT_DIR, filename), 'rb').read())
-        expected[u'files'][filename][u'sha-1'] = unicode(h.hexdigest())
 
-    actual = json.load(open(self.result, 'rb'))
-    self.assertEquals(expected, actual)
+    self.assertEquals(expected, json.load(open(self.result, 'rb')))
     return expected
 
-  def _execute(self, filename, args, need_output=False):
+  def _expect_no_result(self):
+    self.assertFalse(os.path.exists(self.result))
+
+  def _execute(self, mode, case, args, need_output):
+    """Executes isolate.py."""
+    self.assertEquals(
+        mode, self.mode(), 'Rename the test fixture to Isolate_%s' % mode)
+    self.assertEquals(
+        case,
+        self.case() + '.isolate',
+        'Rename the test case to test_%s()' % case)
+    # TODO(maruel): This is going away, temporary until DEPTH support is
+    # removed.
+    depth = os.path.join('data', 'isolate')
+    if RELATIVE_CWD[self.case()] != '.':
+      depth = '.'
     cmd = [
       sys.executable, os.path.join(ROOT_DIR, 'isolate.py'),
-      '--variable', 'DEPTH=%s' % ROOT_DIR,
       '--result', self.result,
-      os.path.join(ROOT_DIR, 'data', 'isolate', filename),
-    ] + args
+      '--outdir', self.outdir,
+      '-V', 'DEPTH=%s' % depth,
+      self.filename(),
+      '--mode', self.mode(),
+    ]
+    cmd.extend(args)
+
     env = os.environ.copy()
     if 'ISOLATE_DEBUG' in env:
       del env['ISOLATE_DEBUG']
+
     if need_output or not VERBOSE:
       stdout = subprocess.PIPE
       stderr = subprocess.STDOUT
@@ -118,9 +174,10 @@ class Isolate(unittest.TestCase):
       cmd.extend(['-v'] * 3)
       stdout = None
       stderr = None
+
     cwd = ROOT_DIR
     p = subprocess.Popen(
-        cmd + args,
+        cmd,
         stdout=stdout,
         stderr=stderr,
         cwd=cwd,
@@ -131,6 +188,27 @@ class Isolate(unittest.TestCase):
       raise CalledProcessError(p.returncode, cmd, out, cwd)
     return out
 
+  def mode(self):
+    """Returns the execution mode corresponding to this test case."""
+    test_id = self.id().split('.')
+    self.assertEquals(3, len(test_id))
+    self.assertEquals('__main__', test_id[0])
+    return re.match('^Isolate_([a-z]+)$', test_id[1]).group(1)
+
+  def case(self):
+    """Returns the filename corresponding to this test case."""
+    test_id = self.id().split('.')
+    return re.match('^test_([a-z_]+)$', test_id[2]).group(1)
+
+  def filename(self):
+    """Returns the filename corresponding to this test case."""
+    filename = os.path.join(
+        ROOT_DIR, 'data', 'isolate', self.case() + '.isolate')
+    self.assertTrue(os.path.isfile(filename), filename)
+    return filename
+
+
+class Isolate(unittest.TestCase):
   def test_help_modes(self):
     # Check coherency in the help and implemented modes.
     p = subprocess.Popen(
@@ -144,95 +222,295 @@ class Isolate(unittest.TestCase):
     out = out[:out.index('')]
     modes = [re.match(r'^  (\w+) .+', l) for l in out]
     modes = tuple(m.group(1) for m in modes if m)
-    # Keep the list hard coded.
-    expected = ('check', 'hashtable', 'remap', 'run', 'trace')
-    self.assertEquals(expected, modes)
-    self.assertEquals(expected, modes)
-    for mode in modes:
-      self.assertTrue(hasattr(self, 'test_%s' % mode), mode)
-    self._expected_tree([])
-
-  def test_check(self):
-    self._execute('fail.isolate', ['--mode', 'check'])
-    self._expected_tree(['result'])
-    self._expected_result(
-        False, dict((f, {}) for f in self.files), ['child.py', '--fail'], False)
-
-  def test_check_no_run(self):
-    self._execute('no_run.isolate', ['--mode', 'check'])
-    self._expected_tree(['result'])
-    self._expected_result(
-        False, dict((f, {}) for f in self.files), None, False)
-
-  def test_check_non_existent(self):
+    self.assertEquals(EXPECTED_MODES, modes)
+
+  def test_modes(self):
+    # This is a bit redundant but make sure all combinations are tested.
+    files = sorted(
+      i[:-len('.isolate')]
+      for i in os.listdir(os.path.join(ROOT_DIR, 'data', 'isolate'))
+      if i.endswith('.isolate')
+    )
+    self.assertEquals(sorted(RELATIVE_CWD), files)
+    self.assertEquals(sorted(DEPENDENCIES), files)
+    for mode in EXPECTED_MODES:
+      expected_cases = set('test_%s' % f for f in files)
+      fixture_name = 'Isolate_%s' % mode
+      fixture = getattr(sys.modules[__name__], fixture_name)
+      actual_cases = set(i for i in dir(fixture) if i.startswith('test_'))
+      missing = expected_cases - actual_cases
+      self.assertFalse(missing, '%s.%s' % (fixture_name, missing))
+
+
+class Isolate_check(IsolateBase):
+  LEVEL = isolate.NO_INFO
+
+  def test_fail(self):
+    self._execute('check', 'fail.isolate', [], False)
+    self._expect_no_tree()
+    self._expected_result(['fail.py'], None)
+
+  def test_missing_trailing_slash(self):
     try:
-      self._execute('non_existent.isolate', ['--mode', 'check'])
+      self._execute('check', 'missing_trailing_slash.isolate', [], False)
       self.fail()
     except subprocess.CalledProcessError:
       pass
-    self._expected_tree([])
+    self._expect_no_tree()
+    self._expect_no_result()
 
-  def test_check_directory_no_slash(self):
+  def test_non_existent(self):
     try:
-      self._execute('missing_trailing_slash.isolate', ['--mode', 'check'])
+      self._execute('check', 'non_existent.isolate', [], False)
       self.fail()
     except subprocess.CalledProcessError:
       pass
-    self._expected_tree([])
+    self._expect_no_tree()
+    self._expect_no_result()
 
-  def test_hashtable(self):
-    cmd = [
-      '--mode', 'hashtable',
-      '--outdir', self.tempdir,
-    ]
-    self._execute('no_run.isolate', cmd)
-    data = self._expected_result(True, self.files, None, False)
-    self._expected_tree(
-        [f['sha-1'] for f in data['files'].itervalues()] + ['result'])
+  def test_no_run(self):
+    self._execute('check', 'no_run.isolate', [], False)
+    self._expect_no_tree()
+    self._expected_result([], None)
 
-  def test_remap(self):
-    cmd = [
-      '--mode', 'remap',
-      '--outdir', self.tempdir,
-    ]
-    self._execute('no_run.isolate', cmd)
-    self._expected_tree(['data', 'result'])
-    self._expected_result(
-        False,
-        self.files,
-        None,
-        False)
-
-  def test_run(self):
-    self._execute('ok.isolate', ['--mode', 'run'])
-    self._expected_tree(['result'])
-    # cmd[0] is not generated from infiles[0] so it's not using a relative path.
-    self._expected_result(
-        False, self.files, ['child.py', '--ok'], False)
-
-  def test_run_fail(self):
+  def test_touch_root(self):
+    self._execute('check', 'touch_root.isolate', [], False)
+    self._expect_no_tree()
+    self._expected_result(['touch_root.py'], None)
+
+  def test_with_flag(self):
+    self._execute('check', 'with_flag.isolate', ['-V', 'FLAG=gyp'], False)
+    self._expect_no_tree()
+    self._expected_result(['with_flag.py', 'gyp'], None)
+
+
+class Isolate_hashtable(IsolateBase):
+  LEVEL = isolate.WITH_HASH
+
+  def _expected_hash_tree(self):
+    """Verifies the files written in the temporary directory."""
+    expected = [v['sha-1'] for v in self._gen_files(False).itervalues()]
+    self.assertEquals(sorted(expected), self._result_tree())
+
+  def test_fail(self):
+    self._execute('hashtable', 'fail.isolate', [], False)
+    self._expected_hash_tree()
+    self._expected_result(['fail.py'], None)
+
+  def test_missing_trailing_slash(self):
     try:
-      self._execute('fail.isolate', ['--mode', 'run'])
+      self._execute('hashtable', 'missing_trailing_slash.isolate', [], False)
       self.fail()
     except subprocess.CalledProcessError:
       pass
-    self._expected_tree(['result'])
-
-  def test_trace(self):
-    out = self._execute('ok.isolate', ['--mode', 'trace'], True)
-    self._expected_tree(['result', 'result.log'])
-    # The 'result.log' log is OS-specific so we can't read it but we can read
-    # the gyp result.
-    # cmd[0] is not generated from infiles[0] so it's not using a relative path.
-    self._expected_result(
-        False, self.files, ['child.py', '--ok'], False)
-
-    expected_value = {
+    self._expect_no_tree()
+    self._expect_no_result()
+
+  def test_non_existent(self):
+    try:
+      self._execute('hashtable', 'non_existent.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_no_tree()
+    self._expect_no_result()
+
+  def test_no_run(self):
+    self._execute('hashtable', 'no_run.isolate', [], False)
+    self._expected_hash_tree()
+    self._expected_result([], None)
+
+  def test_touch_root(self):
+    self._execute('hashtable', 'touch_root.isolate', [], False)
+    self._expected_hash_tree()
+    self._expected_result(['touch_root.py'], None)
+
+  def test_with_flag(self):
+    self._execute('hashtable', 'with_flag.isolate', ['-V', 'FLAG=gyp'], False)
+    self._expected_hash_tree()
+    self._expected_result(['with_flag.py', 'gyp'], None)
+
+
+class Isolate_remap(IsolateBase):
+  LEVEL = isolate.STATS_ONLY
+
+  def test_fail(self):
+    self._execute('remap', 'fail.isolate', [], False)
+    self._expected_tree()
+    self._expected_result(['fail.py'], None)
+
+  def test_missing_trailing_slash(self):
+    try:
+      self._execute('remap', 'missing_trailing_slash.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_no_tree()
+    self._expect_no_result()
+
+  def test_non_existent(self):
+    try:
+      self._execute('remap', 'non_existent.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_no_tree()
+    self._expect_no_result()
+
+  def test_no_run(self):
+    self._execute('remap', 'no_run.isolate', [], False)
+    self._expected_tree()
+    self._expected_result([], None)
+
+  def test_touch_root(self):
+    self._execute('remap', 'touch_root.isolate', [], False)
+    self._expected_tree()
+    self._expected_result(['touch_root.py'], None)
+
+  def test_with_flag(self):
+    self._execute('remap', 'with_flag.isolate', ['-V', 'FLAG=gyp'], False)
+    self._expected_tree()
+    self._expected_result(['with_flag.py', 'gyp'], None)
+
+
+class Isolate_run(IsolateBase):
+  LEVEL = isolate.STATS_ONLY
+
+  def _expect_empty_tree(self):
+    self.assertEquals([], self._result_tree())
+
+  def test_fail(self):
+    try:
+      self._execute('run', 'fail.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_empty_tree()
+    self._expected_result(['fail.py'], None)
+
+  def test_missing_trailing_slash(self):
+    try:
+      self._execute('run', 'missing_trailing_slash.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_no_tree()
+    self._expect_no_result()
+
+  def test_non_existent(self):
+    try:
+      self._execute('run', 'non_existent.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_no_tree()
+    self._expect_no_result()
+
+  def test_no_run(self):
+    try:
+      self._execute('run', 'no_run.isolate', [], False)
+      self.fail()
+    except subprocess.CalledProcessError:
+      pass
+    self._expect_empty_tree()
+    self._expected_result([], None)
+
+  def test_touch_root(self):
+    self._execute('run', 'touch_root.isolate', [], False)
+    self._expect_empty_tree()
+    self._expected_result(['touch_root.py'], None)
+
+  def test_with_flag(self):
+    self._execute('run', 'with_flag.isolate', ['-V', 'FLAG=run'], False)
+    # Not sure about the empty tree, should be deleted.
+    self._expect_empty_tree()
+    self._expected_result(['with_flag.py', 'run'], None)
+
+
+class Isolate_trace(IsolateBase):
+  LEVEL = isolate.STATS_ONLY
+
+  @staticmethod
+  def _to_string(values):
+    buf = cStringIO.StringIO()
+    isolate.trace_inputs.pretty_print(values, buf)
+    return buf.getvalue()
+
+  def test_fail(self):
+    try:
+      self._execute('trace', 'fail.isolate', [], True)
+      self.fail()
+    except subprocess.CalledProcessError, e:
+      out = e.output
+    self._expect_no_tree()
+    self._expected_result(['fail.py'], None)
+    expected = 'Failure: 1\nFailing\n\n'
+    self.assertEquals(expected, out)
+
+  def test_missing_trailing_slash(self):
+    try:
+      self._execute('trace', 'missing_trailing_slash.isolate', [], True)
+      self.fail()
+    except subprocess.CalledProcessError, e:
+      out = e.output
+    self._expect_no_tree()
+    self._expect_no_result()
+    expected = 'Input directory %s must have a trailing slash\n' % os.path.join(
+        ROOT_DIR, 'data', 'isolate', 'files1')
+    self.assertEquals(expected, out)
+
+  def test_non_existent(self):
+    try:
+      self._execute('trace', 'non_existent.isolate', [], True)
+      self.fail()
+    except subprocess.CalledProcessError, e:
+      out = e.output
+    self._expect_no_tree()
+    self._expect_no_result()
+    expected = 'Input file %s doesn\'t exist\n' % os.path.join(
+        ROOT_DIR, 'data', 'isolate', 'A_file_that_do_not_exist')
+    self.assertEquals(expected, out)
+
+  def test_no_run(self):
+    try:
+      self._execute('trace', 'no_run.isolate', [], True)
+      self.fail()
+    except subprocess.CalledProcessError, e:
+      out = e.output
+    self._expect_no_tree()
+    self._expected_result([], None)
+    expected = 'No command to run\n'
+    self.assertEquals(expected, out)
+
+  def test_touch_root(self):
+    out = self._execute('trace', 'touch_root.isolate', [], True)
+    self._expect_no_tree()
+    self._expected_result(['touch_root.py'], None)
+    expected = {
+      'conditions': [
+        ['OS=="%s"' % isolate.trace_inputs.get_flavor(), {
+          'variables': {
+            isolate.trace_inputs.KEY_TRACKED: [
+              'touch_root.py',
+              '../../isolate.py',
+            ],
+          },
+        }],
+      ],
+    }
+    self.assertEquals(self._to_string(expected), out)
+
+  def test_with_flag(self):
+    out = self._execute(
+        'trace', 'with_flag.isolate', ['-V', 'FLAG=trace'], True)
+    self._expect_no_tree()
+    self._expected_result(['with_flag.py', 'trace'], None)
+    expected = {
       'conditions': [
         ['OS=="%s"' % isolate.trace_inputs.get_flavor(), {
           'variables': {
             isolate.trace_inputs.KEY_TRACKED: [
-              'child.py',
+              'with_flag.py',
             ],
             isolate.trace_inputs.KEY_UNTRACKED: [
               'files1/',
@@ -241,9 +519,7 @@ class Isolate(unittest.TestCase):
         }],
       ],
     }
-    expected_buffer = cStringIO.StringIO()
-    isolate.trace_inputs.pretty_print(expected_value, expected_buffer)
-    self.assertEquals(expected_buffer.getvalue(), out)
+    self.assertEquals(self._to_string(expected), out)