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

tests/owners_unittest.py

Index: tests/owners_unittest.py
===================================================================
--- tests/owners_unittest.py	(revision 125361)
+++ tests/owners_unittest.py	(working copy)
@@ -44,6 +44,7 @@
     '/chrome/renderer/safe_browsing/scorer.h': '',
     '/content/OWNERS': owners_file(john, darin, comment='foo', noparent=True),
     '/content/content.gyp': '',
+    '/content/bar/foo.cc': '',
     '/content/views/OWNERS': owners_file(ben, john, owners.EVERYONE,
                                          noparent=True),
   })
@@ -87,48 +88,70 @@
   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_covered_by__no_files(self):
+    self.assert_covered_by([], [ben])
 
-  def test_not_covered_by__need_at_least_one_reviewer(self):
-    self.assert_not_covered_by(['DEPS'], [], ['DEPS'])
+  def test_covered_by__no_files_no_reviewers(self):
+    self.assert_covered_by([], [])
 
-  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_covered_by__at_least_one_reviewer(self):
+    db = self.db()
+    self.assertFalse(db.files_are_covered_by(set(['DEPS']), set([])))
 
-  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_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__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',
+                                     'content/bar/foo.cc',
+                                     'chrome/renderer/gpu/gpu_channel_host.h'],
+                                    [ken],
+                                    ['content'])
+
+
   def assert_reviewers_for(self, files, expected_reviewers):
     db = self.db()
     self.assertEquals(db.reviewers_for(set(files)), set(expected_reviewers))