Show a list of directories missing OWNER reviewers on upload, and show directories rather than file…

tests/owners_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Unit tests for owners.py."""
 
 import os
 import sys
 import unittest
@@ skipping 26 matching lines @@
     '/OWNERS': owners_file(owners.EVERYONE),
     '/base/vlog.h': '',
     '/chrome/OWNERS': owners_file(ben, brett),
     '/chrome/gpu/OWNERS': owners_file(ken),
     '/chrome/gpu/gpu_channel.h': '',
     '/chrome/renderer/OWNERS': owners_file(peter),
     '/chrome/renderer/gpu/gpu_channel_host.h': '',
     '/chrome/renderer/safe_browsing/scorer.h': '',
     '/content/OWNERS': owners_file(john, darin, comment='foo', noparent=True),
     '/content/content.gyp': '',
+    '/content/bar/foo.cc': '',
+    '/content/baz/OWNERS': owners_file(brett),
+    '/content/baz/froboz.h': '',
     '/content/views/OWNERS': owners_file(ben, john, owners.EVERYONE,
                                          noparent=True),
   })
 
 
 class OwnersDatabaseTest(unittest.TestCase):
   def setUp(self):
     self.repo = test_repo()
     self.files = self.repo.files
     self.root = '/'
     self.fopen = self.repo.open_for_reading
 
   def db(self, root=None, fopen=None, os_path=None):
     root = root or self.root
     fopen = fopen or self.fopen
     os_path = os_path or self.repo
     return owners.Database(root, fopen, os_path)
 
   def test_constructor(self):
     self.assertNotEquals(self.db(), None)
 
-  def assert_covered_by(self, files, reviewers):
-    db = self.db()
-    self.assertTrue(db.files_are_covered_by(set(files), set(reviewers)))
-
-  def test_covered_by__everyone(self):
-    self.assert_covered_by(['DEPS'], [john])
-    self.assert_covered_by(['DEPS'], [darin])
-
-  def test_covered_by__explicit(self):
-    self.assert_covered_by(['content/content.gyp'], [john])
-    self.assert_covered_by(['chrome/gpu/OWNERS'], [ken])
-
-  def test_covered_by__owners_plus_everyone(self):
-    self.assert_covered_by(['/content/views/OWNERS'], [ben])
-    self.assert_covered_by(['/content/views/OWNERS'], [ken])
-
-  def test_covered_by__owners_propagates_down(self):
-    self.assert_covered_by(['chrome/gpu/OWNERS'], [ben])
-
-  def test_covered_by__no_file_in_dir(self):
-    self.assert_covered_by(['/chrome/renderer/gpu/gpu_channel_host.h'], [peter])
-
-  def assert_not_covered_by(self, files, reviewers, unreviewed_files):
-    db = self.db()
-    self.assertEquals(db.files_not_covered_by(set(files), set(reviewers)),
-                      set(unreviewed_files))
-
-  def test_not_covered_by__need_at_least_one_reviewer(self):
-    self.assert_not_covered_by(['DEPS'], [], ['DEPS'])
-
-  def test_not_covered_by__owners_propagates_down(self):
-    self.assert_not_covered_by(
-      ['chrome/gpu/gpu_channel.h', 'chrome/renderer/gpu/gpu_channel_host.h'],
-      [ben], [])
-
-  def test_not_covered_by__partial_covering(self):
-    self.assert_not_covered_by(
-      ['content/content.gyp', 'chrome/renderer/gpu/gpu_channel_host.h'],
-      [peter], ['content/content.gyp'])
-
-  def test_not_covered_by__set_noparent_works(self):
-    self.assert_not_covered_by(['content/content.gyp'], [ben],
-                             ['content/content.gyp'])
-
-  def test_not_covered_by__valid_inputs(self):
+  def test_dirs_not_covered_by__valid_inputs(self):
     db = self.db()
 
     # Check that we're passed in a sequence that isn't a string.
-    self.assertRaises(AssertionError, db.files_not_covered_by, 'foo', [])
+    self.assertRaises(AssertionError, db.directories_not_covered_by, 'foo', [])
     if hasattr(owners.collections, 'Iterable'):
-      self.assertRaises(AssertionError, db.files_not_covered_by,
+      self.assertRaises(AssertionError, db.directories_not_covered_by,
                         (f for f in ['x', 'y']), [])
 
     # Check that the files are under the root.
     db.root = '/checkout'
-    self.assertRaises(AssertionError, db.files_not_covered_by, ['/OWNERS'],
-                      [])
+    self.assertRaises(AssertionError, db.directories_not_covered_by,
+                      ['/OWNERS'], [])
     db.root = '/'
 
     # Check invalid email address.
-    self.assertRaises(AssertionError, db.files_not_covered_by, ['OWNERS'],
-                      ['foo'])
+    self.assertRaises(AssertionError, db.directories_not_covered_by,
+                      ['OWNERS'], ['foo'])
 
+  def assert_dirs_not_covered_by(self, files, reviewers, unreviewed_dirs):
+    db = self.db()
+    self.assertEquals(
+        db.directories_not_covered_by(set(files), set(reviewers)),
+        set(unreviewed_dirs))
+
+  def test_dirs_not_covered_by__owners_propagates_down(self):
+    self.assert_dirs_not_covered_by(
+      ['chrome/gpu/gpu_channel.h', 'chrome/renderer/gpu/gpu_channel_host.h'],
+      [ben], [])
+
+  def test_dirs_not_covered_by__partial_covering(self):
+    self.assert_dirs_not_covered_by(
+      ['content/content.gyp', 'chrome/renderer/gpu/gpu_channel_host.h'],
+      [peter], ['content'])
+
+  def test_dirs_not_covered_by__set_noparent_works(self):
+    self.assert_dirs_not_covered_by(['content/content.gyp'], [ben],
+                                    ['content'])
+
+  def test_dirs_not_covered_by__no_reviewer(self):
+    self.assert_dirs_not_covered_by(
+      ['content/content.gyp', 'chrome/renderer/gpu/gpu_channel_host.h'],
+      [], ['content'])
+
+  def test_dirs_not_covered_by__combines_directories(self):
+    self.assert_dirs_not_covered_by(['content/content.gyp',
+                                     'content/bar/foo.cc',
+                                     'chrome/renderer/gpu/gpu_channel_host.h'],
+                                    [peter],
+                                    ['content'])
+
+  def test_dirs_not_covered_by__multiple_directories(self):
+    self.assert_dirs_not_covered_by(
+        ['content/content.gyp',                    # Not covered
+         'content/bar/foo.cc',                     # Not covered (combines in)
+         'content/baz/froboz.h',                   # Not covered
+         'chrome/gpu/gpu_channel.h',               # Owned by ken
+         'chrome/renderer/gpu/gpu_channel_host.h'  # Owned by * via parent
+        ],
+        [ken],
+        ['content', 'content/baz'])
 
   def assert_reviewers_for(self, files, expected_reviewers):
     db = self.db()
     self.assertEquals(db.reviewers_for(set(files)), set(expected_reviewers))
 
   def test_reviewers_for__basic_functionality(self):
     self.assert_reviewers_for(['chrome/gpu/gpu_channel.h'],
                              [ken, ben, brett, owners.EVERYONE])
 
   def test_reviewers_for__set_noparent_works(self):
@@ skipping 30 matching lines @@
 
   def test_syntax_error__unknown_set(self):
     self.assert_syntax_error('set myfatherisbillgates\n')
 
   def test_syntax_error__bad_email(self):
     self.assert_syntax_error('ben\n')
 
 
 if __name__ == '__main__':
   unittest.main()