Backed out changeset f698c4b34515 (bug 1579845) for causing lint failure on foobar.js CLOSED TREE

tools/lint/license/__init__.py

@@ -85,9 +85,6 @@ def is_test(f):
     """
     is the file a test or not?
     """
-    if "lint/test/" in f:
-        # For the unit tests
-        return False
     return ("/test" in f or "/gtest" in f or "/crashtest" in f or "/mochitest" in f
             or "/reftest" in f or "/imptest" in f or "/androidTest" in f
             or "/jit-test/" in f or "jsapi-tests/" in f)

tools/lint/test/files/license/bad.c

@@ -1 +0,0 @@
-int main() { return 0; }

tools/lint/test/files/license/bad.js

@@ -1,15 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-// We should not have GPLv3 in the code.
-

tools/lint/test/files/license/good-other.h

@@ -1,9 +0,0 @@
-/*
-Permission to use, copy, modify, distribute and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation.  Samphan Raruenrom makes no
-representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-*/

tools/lint/test/files/license/good.c

@@ -1,8 +0,0 @@
-
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-int main() { return 0; }

tools/lint/test/files/license/good.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-# Nothing
-

tools/lint/test/python.ini

@@ -9,4 +9,3 @@ skip-if = os == "mac"  # pip unable to find 'flake8==3.5.0'
 [test_file_perm.py]
 skip-if = os == "win"
 [test_file_whitespace.py]
-[test_file_license.py]

tools/lint/test/test_file_license.py

@@ -1,23 +0,0 @@
-from __future__ import absolute_import, print_function
-
-import mozunit
-
-LINTER = 'license'
-
-
-def test_lint_license(lint, paths):
-    results = lint(paths())
-    print(results)
-    assert len(results) == 2
-
-    assert "No matching license strings" in results[0].message
-    assert results[0].level == "error"
-    assert "bad.c" in results[0].relpath
-
-    assert "No matching license strings" in results[1].message
-    assert results[1].level == "error"
-    assert "bad.js" in results[1].relpath
-
-
-if __name__ == '__main__':
-    mozunit.main()