Merge pull request #53 from jwnimmer-tri/cpplint-close-namespace-strict2

[cpplint] Fix unit tests for closing namespace comments

cpplint/cpplint_unittest.py

@@ -3442,16 +3442,13 @@ def testEndOfNamespaceComments(self):
                             ['}  // anonymous namespace (utils)',  # Variant
                              'namespace {'] +
                             ([''] * 10) +
-                            ['}  // anonymous namespace',  # No warning
+                            ['}  // anonymous namespace',  # Anon warning
                              'namespace missing_comment {'] +
                             ([''] * 10) +
                             ['}',  # Warning here
                              'namespace no_warning {'] +
                             ([''] * 10) +
                             ['}  // namespace no_warning',
-                             'namespace no_warning {'] +
-                            ([''] * 10) +
-                            ['};  // end namespace no_warning',
                              '#define MACRO \\',
                              'namespace c_style { \\'] +
                             (['\\'] * 10) +
@@ -3467,13 +3464,9 @@ def testEndOfNamespaceComments(self):
     self.assertEquals(1, error_collector.Results().count(
         'Namespace should be terminated with "// namespace nested"'
         '  [readability/namespace] [5]'))
-    self.assertEquals(3, error_collector.Results().count(
+    self.assertEquals(6, error_collector.Results().count(
         'Anonymous namespace should be terminated with "// namespace"'
         '  [readability/namespace] [5]'))
-    self.assertEquals(2, error_collector.Results().count(
-        'Anonymous namespace should be terminated with "// namespace" or'
-        ' "// anonymous namespace"'
-        '  [readability/namespace] [5]'))
     self.assertEquals(1, error_collector.Results().count(
         'Namespace should be terminated with "// namespace missing_comment"'
         '  [readability/namespace] [5]'))