Fix per-file owners check for deleted files.

tests/owners_unittest.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.
 
 """Unit tests for owners.py."""
 
 import os
 import sys
 import unittest
@@ skipping 55 matching lines @@
     '/content/views/pie.h': '',
   })
 
 
 class _BaseTestCase(unittest.TestCase):
   def setUp(self):
     self.repo = test_repo()
     self.files = self.repo.files
     self.root = '/'
     self.fopen = self.repo.open_for_reading
-    self.glob = self.repo.glob
 
-  def db(self, root=None, fopen=None, os_path=None, glob=None):
+  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
-    glob = glob or self.glob
-    return owners.Database(root, fopen, os_path, glob)
+    return owners.Database(root, fopen, os_path)
 
 
 class OwnersDatabaseTest(_BaseTestCase):
   def test_constructor(self):
     self.assertNotEquals(self.db(), None)
 
   def test_files_not_covered_by__valid_inputs(self):
     db = self.db()
 
     # Check that we're passed in a sequence that isn't a string.
@@ skipping 49 matching lines @@
         ['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.gyp', 'content/bar/foo.cc', 'content/baz/froboz.h'])
 
   def test_per_file(self):
-    # brett isn't allowed to approve ugly.cc

[dtu, 2016/07/14 01:06:51]

This comment didn't match the code. The OWNERS file does allow brett to approve
ugly.cc.

[Dirk Pranke, 2016/07/14 19:52:23]

true, good catch.

     self.files['/content/baz/OWNERS'] = owners_file(brett,
         lines=['per-file ugly.*=tom@example.com'])
+
+    # peter isn't allowed to approve ugly.cc
+    self.assert_files_not_covered_by(['content/baz/ugly.cc'],
+                                    [peter],
+                                    ['content/baz/ugly.cc'])
+
+    # brett is allowed to approve ugly.cc
     self.assert_files_not_covered_by(['content/baz/ugly.cc'],
                                     [brett],
                                     [])
 
     # tom is allowed to approve ugly.cc, but not froboz.h
     self.assert_files_not_covered_by(['content/baz/ugly.cc'],
                                     [tom],
                                     [])
     self.assert_files_not_covered_by(['content/baz/froboz.h'],
                                     [tom],
                                     ['content/baz/froboz.h'])
 
   def test_per_file_with_spaces(self):
     # This is the same as test_per_file(), except that we include spaces
-    # on the per-file line. brett isn't allowed to approve ugly.cc;
+    # on the per-file line.
     # tom is allowed to approve ugly.cc, but not froboz.h
     self.files['/content/baz/OWNERS'] = owners_file(brett,
         lines=['per-file ugly.* = tom@example.com'])
+
+    # peter isn't allowed to approve ugly.cc
+    self.assert_files_not_covered_by(['content/baz/ugly.cc'],
+                                    [peter],
+                                    ['content/baz/ugly.cc'])
+
+    # brett is allowed to approve ugly.cc
     self.assert_files_not_covered_by(['content/baz/ugly.cc'],
                                     [brett],
                                     [])
 
+    # tom is allowed to approve ugly.cc, but not froboz.h
     self.assert_files_not_covered_by(['content/baz/ugly.cc'],
                                     [tom],
                                     [])
     self.assert_files_not_covered_by(['content/baz/froboz.h'],
                                     [tom],
                                     ['content/baz/froboz.h'])
 
+  def test_per_file_with_nonexistent_file(self):
+    self.files['/content/baz/OWNERS'] = owners_file(brett,
+        lines=['per-file ugly.*=tom@example.com'])
+
+    # peter isn't allowed to approve ugly.nonexistent.cc, but brett and tom are.
+    self.assert_files_not_covered_by(['content/baz/ugly.nonexistent.cc'],
+                                    [peter],
+                                    ['content/baz/ugly.nonexistent.cc'])
+    self.assert_files_not_covered_by(['content/baz/ugly.nonexistent.cc'],
+                                    [brett],
+                                    [])
+    self.assert_files_not_covered_by(['content/baz/ugly.nonexistent.cc'],
+                                    [tom],
+                                    [])
+
   def test_per_file__set_noparent(self):
     self.files['/content/baz/OWNERS'] = owners_file(brett,
         lines=['per-file ugly.*=tom@example.com',
                'per-file ugly.*=set noparent'])
 
     # brett isn't allowed to approve ugly.cc
     self.assert_files_not_covered_by(['content/baz/ugly.cc'],
                                     [brett],
                                     ['content/baz/ugly.cc'])
 
@@ skipping 281 matching lines @@
                       ('chrome/browser', 2)],
                 ken: [('chrome/gpu', 1)],
                 peter: [('chrome/renderer', 1)],
                 brett: [('chrome/browser', 1)]},
                ['chrome/gpu', 'chrome/renderer',
                 'chrome/browser'],
                ben)
 
 if __name__ == '__main__':
   unittest.main()