diff mbox series

[3/5] support/testing: add test for check-package

Message ID 20181103045624.31059-4-ricardo.martincoski@gmail.com
State Changes Requested
Headers show
Series Fix bug 11271 and add test for check-package | expand

Commit Message

Ricardo Martincoski Nov. 3, 2018, 4:56 a.m. UTC
Check the basic usage for check-package.

It can be called using either absolute path, relative path or from PATH.
Files to be checked can be passed with either absolute path or relative
path (also including files in the current directory).

Also check it ignores some special files when checking intree files,
i.e. package/pkg-generic.mk, while still generating warnings for out-of-tree
files when called with -b.
In order to allow the later, add an empty line to the Config.in in the
br2-external being tested so the script does generate a warning.

Catches bug #11271.

More tests can be added later, for example compatibility to Python 3.

Suggested-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
NOTE: please don't remove the empty line on
support/testing/tests/utils/br2-external/Config.in
as it was intended.
---
 .gitlab-ci.yml                                |   1 +
 support/testing/tests/utils/__init__.py       |   0
 .../tests/utils/br2-external/Config.in        |   1 +
 .../tests/utils/br2-external/external.desc    |   1 +
 .../tests/utils/br2-external/external.mk      |   0
 .../testing/tests/utils/test_check_package.py | 148 ++++++++++++++++++
 6 files changed, 151 insertions(+)
 create mode 100644 support/testing/tests/utils/__init__.py
 create mode 100644 support/testing/tests/utils/br2-external/Config.in
 create mode 100644 support/testing/tests/utils/br2-external/external.desc
 create mode 100644 support/testing/tests/utils/br2-external/external.mk
 create mode 100644 support/testing/tests/utils/test_check_package.py

Comments

Arnout Vandecappelle Aug. 3, 2019, 3:19 p.m. UTC | #1
Hi Ricardo,

On 03/11/2018 05:56, Ricardo Martincoski wrote:
> Check the basic usage for check-package.
> 
> It can be called using either absolute path, relative path or from PATH.
> Files to be checked can be passed with either absolute path or relative
> path (also including files in the current directory).
> 
> Also check it ignores some special files when checking intree files,
> i.e. package/pkg-generic.mk, while still generating warnings for out-of-tree
> files when called with -b.
> In order to allow the later, add an empty line to the Config.in in the
> br2-external being tested so the script does generate a warning.
> 
> Catches bug #11271.
> 
> More tests can be added later, for example compatibility to Python 3.
[snip]
> diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py
> new file mode 100644
> index 0000000000..85f2e280a8
> --- /dev/null
> +++ b/support/testing/tests/utils/test_check_package.py
> @@ -0,0 +1,148 @@
> +"""Test cases for utils/check-package.
> +
> +It does not inherit from infra.basetest.BRTest and therefore does not generate a logfile.

 Lines should be wrapped at 80 columns. We override that limit in the gitlab-CI
test because sometimes the code is uglier by wrapping exactly at 80, but the
.flake8 file does set the limit at 80.

 So I've rewrapped the entire file where appropriate. I've done the same with
the following two commits.

> +Only when the tests fail there will be output to the console.
> +The make target ('make check-package') is already used by the job 'check-package' and won't be tested here.
> +"""
> +import os
> +import subprocess
> +import unittest
> +
> +import infra
> +
> +
> +def call_script(args, env, cwd):
> +    """Call a script and return stdout and stderr as lists."""
> +    out, err = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, cwd=cwd).communicate()
> +    return out.splitlines(), err.splitlines()
> +
> +
> +class TestCheckPackage(unittest.TestCase):
> +    """Base class for all test cases for check-package.

 Since there is only one derived class, and it doesn't seem worth to make
additional classes even if more tests are added, I've merged this with
TestCheckPackageBasicUsage.

> +
> +    It inherits from TestCase so its methods can use unittest assertions but it does not declare a test_run method in order to be
> +    ignored by nose2 when the test cases are discovered.
> +    """
> +
> +    WITH_EMPTY_PATH = {}
> +    WITH_UTILS_IN_PATH = {"PATH": infra.basepath("utils") + ":" + os.environ["PATH"]}
> +    relative = [
> +        # base_script           base_file               rel_script               rel_file                rel_cwd
> +        ["utils/check-package", "package/atop/atop.mk", "./utils/check-package", "package/atop/atop.mk", ""],
> +        ["utils/check-package", "package/atop/atop.mk", "./utils/check-package", "./package/atop/atop.mk", ""],
> +        ["utils/check-package", "package/atop/atop.mk", "../../utils/check-package", "atop.mk", "package/atop"],
> +        ["utils/check-package", "package/atop/atop.mk", "../../utils/check-package", "./atop.mk", "package/atop"],
> +        ["utils/check-package", "package/atop/atop.mk", "../utils/check-package", "atop/atop.mk", "package"],
> +        ["utils/check-package", "package/atop/atop.mk", "../utils/check-package", "./atop/atop.mk", "package"],
> +        ["utils/check-package", "package/atop/Config.in", "./utils/check-package", "package/atop/Config.in", ""],
> +        ["utils/check-package", "package/atop/Config.in", "./utils/check-package", "./package/atop/Config.in", ""],
> +        ["utils/check-package", "package/atop/Config.in", "../../utils/check-package", "Config.in", "package/atop"],
> +        ["utils/check-package", "package/atop/Config.in", "../../utils/check-package", "./Config.in", "package/atop"],
> +        ["utils/check-package", "package/atop/Config.in", "../utils/check-package", "atop/Config.in", "package"],
> +        ["utils/check-package", "package/atop/Config.in", "../utils/check-package", "./atop/Config.in", "package"]]

 I have the feeling that it would be sufficient to just have rel_cwd in this
table and derive the rest from that (and using a loop for the .mk and
Config.in). But it's not worth spending time on that, so I've kept it as is.


> +
> +    def assert_file_was_processed(self, stderr):
> +        """Infer from check-package stderr if at least one file was processed and fail otherwise."""
> +        self.assertIn("lines processed", stderr[0], stderr)
> +        processed = int(stderr[0].split()[0])
> +        self.assertGreater(processed, 0)
> +
> +    def assert_file_was_ignored(self, stderr):
> +        """Infer from check-package stderr if no file was processed and fail otherwise."""
> +        self.assertIn("lines processed", stderr[0], stderr)
> +        processed = int(stderr[0].split()[0])
> +        self.assertEqual(processed, 0)
> +
> +    def assert_warnings_generated_for_file(self, stderr):
> +        """Infer from check-package stderr if at least one warning was generatd and fail otherwise."""
> +        self.assertIn("warnings generated", stderr[1], stderr)
> +        generated = int(stderr[1].split()[0])
> +        self.assertGreater(generated, 0)
> +
> +
> +class TestCheckPackageBasicUsage(TestCheckPackage):
> +    """Test the various ways the script can be called.
> +
> +    The script can be called either using relative path, absolute path or from PATH.
> +    The files to be checked can be passed as arguments using either relative path or absolute path.
> +    When in in-tree mode (without -b) some in-tree files and also all out-of-tree files are ignored.
> +    When in out-tree mode (with -b) the script does generate warnings.
> +    """
> +
> +    def test_run(self):
> +        """Test the various ways the script can be called in a simple top to bottom sequence."""
> +        # an intree file can be checked by the script called from relative path, absolute path and from PATH
> +        for base_script, base_file, rel_script, rel_file, rel_cwd in self.relative:
> +            abs_script = infra.basepath(base_script)
> +            abs_file = infra.basepath(base_file)
> +            cwd = infra.basepath(rel_cwd)
> +
> +            _, m = call_script([rel_script, rel_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script([abs_script, rel_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script(["check-package", rel_file], self.WITH_UTILS_IN_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script([rel_script, abs_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script([abs_script, abs_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script(["check-package", abs_file], self.WITH_UTILS_IN_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +        # some intree files are ignored
> +        _, m = call_script(["./utils/check-package", "package/pkg-generic.mk"], self.WITH_EMPTY_PATH, infra.basepath())
> +        self.assert_file_was_ignored(m)
> +
> +        _, m = call_script(["./utils/check-package", "-b", "package/pkg-generic.mk"], self.WITH_EMPTY_PATH, infra.basepath())
> +        self.assert_file_was_processed(m)
> +
> +        # an out-of-tree file can be checked by the script called from relative path, absolute path and from PATH
> +        for base_script, base_file, rel_script, rel_file, rel_cwd in self.relative:
> +            abs_script = infra.basepath(base_script)
> +            abs_file = infra.basepath(base_file)
> +            cwd = infra.basepath(rel_cwd)
> +
> +            _, m = call_script([rel_script, "-b", rel_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script([abs_script, "-b", rel_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script(["check-package", "-b", rel_file], self.WITH_UTILS_IN_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script([rel_script, "-b", abs_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script([abs_script, "-b", abs_file], self.WITH_EMPTY_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +            _, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, cwd)
> +            self.assert_file_was_processed(m)
> +
> +        # out-of-tree files are are ignored without -b but can generate warnings with -b
> +        abs_path = infra.filepath("tests/utils/br2-external")

 It might be nice to also test out-of-tree files that are *really* out of tree,
but that's a bit more work...

 Regards,
 Arnout

> +        rel_file = "Config.in"
> +        abs_file = os.path.join(abs_path, rel_file)
> +
> +        _, m = call_script(["check-package", rel_file], self.WITH_UTILS_IN_PATH, abs_path)
> +        self.assert_file_was_ignored(m)
> +
> +        _, m = call_script(["check-package", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath())
> +        self.assert_file_was_ignored(m)
> +
> +        w, m = call_script(["check-package", "-b", rel_file], self.WITH_UTILS_IN_PATH, abs_path)
> +        self.assert_file_was_processed(m)
> +        self.assert_warnings_generated_for_file(m)
> +        self.assertIn("{}:1: empty line at end of file".format(abs_file), w)
> +
> +        w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath())
> +        self.assert_file_was_processed(m)
> +        self.assert_warnings_generated_for_file(m)
> +        self.assertIn("{}:1: empty line at end of file".format(abs_file), w)
>
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5fbdcb0d8..0eeabbdfcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -336,3 +336,4 @@  tests.toolchain.test_external.TestExternalToolchainLinaroArm: *runtime_test
 tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: *runtime_test
 tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: *runtime_test
 tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: *runtime_test
+tests.utils.test_check_package.TestCheckPackageBasicUsage: *runtime_test
diff --git a/support/testing/tests/utils/__init__.py b/support/testing/tests/utils/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/support/testing/tests/utils/br2-external/Config.in b/support/testing/tests/utils/br2-external/Config.in
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/support/testing/tests/utils/br2-external/Config.in
@@ -0,0 +1 @@ 
+
diff --git a/support/testing/tests/utils/br2-external/external.desc b/support/testing/tests/utils/br2-external/external.desc
new file mode 100644
index 0000000000..e89c3560ab
--- /dev/null
+++ b/support/testing/tests/utils/br2-external/external.desc
@@ -0,0 +1 @@ 
+name: CHECK_PACKAGE
diff --git a/support/testing/tests/utils/br2-external/external.mk b/support/testing/tests/utils/br2-external/external.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py
new file mode 100644
index 0000000000..85f2e280a8
--- /dev/null
+++ b/support/testing/tests/utils/test_check_package.py
@@ -0,0 +1,148 @@ 
+"""Test cases for utils/check-package.
+
+It does not inherit from infra.basetest.BRTest and therefore does not generate a logfile.
+Only when the tests fail there will be output to the console.
+The make target ('make check-package') is already used by the job 'check-package' and won't be tested here.
+"""
+import os
+import subprocess
+import unittest
+
+import infra
+
+
+def call_script(args, env, cwd):
+    """Call a script and return stdout and stderr as lists."""
+    out, err = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, cwd=cwd).communicate()
+    return out.splitlines(), err.splitlines()
+
+
+class TestCheckPackage(unittest.TestCase):
+    """Base class for all test cases for check-package.
+
+    It inherits from TestCase so its methods can use unittest assertions but it does not declare a test_run method in order to be
+    ignored by nose2 when the test cases are discovered.
+    """
+
+    WITH_EMPTY_PATH = {}
+    WITH_UTILS_IN_PATH = {"PATH": infra.basepath("utils") + ":" + os.environ["PATH"]}
+    relative = [
+        # base_script           base_file               rel_script               rel_file                rel_cwd
+        ["utils/check-package", "package/atop/atop.mk", "./utils/check-package", "package/atop/atop.mk", ""],
+        ["utils/check-package", "package/atop/atop.mk", "./utils/check-package", "./package/atop/atop.mk", ""],
+        ["utils/check-package", "package/atop/atop.mk", "../../utils/check-package", "atop.mk", "package/atop"],
+        ["utils/check-package", "package/atop/atop.mk", "../../utils/check-package", "./atop.mk", "package/atop"],
+        ["utils/check-package", "package/atop/atop.mk", "../utils/check-package", "atop/atop.mk", "package"],
+        ["utils/check-package", "package/atop/atop.mk", "../utils/check-package", "./atop/atop.mk", "package"],
+        ["utils/check-package", "package/atop/Config.in", "./utils/check-package", "package/atop/Config.in", ""],
+        ["utils/check-package", "package/atop/Config.in", "./utils/check-package", "./package/atop/Config.in", ""],
+        ["utils/check-package", "package/atop/Config.in", "../../utils/check-package", "Config.in", "package/atop"],
+        ["utils/check-package", "package/atop/Config.in", "../../utils/check-package", "./Config.in", "package/atop"],
+        ["utils/check-package", "package/atop/Config.in", "../utils/check-package", "atop/Config.in", "package"],
+        ["utils/check-package", "package/atop/Config.in", "../utils/check-package", "./atop/Config.in", "package"]]
+
+    def assert_file_was_processed(self, stderr):
+        """Infer from check-package stderr if at least one file was processed and fail otherwise."""
+        self.assertIn("lines processed", stderr[0], stderr)
+        processed = int(stderr[0].split()[0])
+        self.assertGreater(processed, 0)
+
+    def assert_file_was_ignored(self, stderr):
+        """Infer from check-package stderr if no file was processed and fail otherwise."""
+        self.assertIn("lines processed", stderr[0], stderr)
+        processed = int(stderr[0].split()[0])
+        self.assertEqual(processed, 0)
+
+    def assert_warnings_generated_for_file(self, stderr):
+        """Infer from check-package stderr if at least one warning was generatd and fail otherwise."""
+        self.assertIn("warnings generated", stderr[1], stderr)
+        generated = int(stderr[1].split()[0])
+        self.assertGreater(generated, 0)
+
+
+class TestCheckPackageBasicUsage(TestCheckPackage):
+    """Test the various ways the script can be called.
+
+    The script can be called either using relative path, absolute path or from PATH.
+    The files to be checked can be passed as arguments using either relative path or absolute path.
+    When in in-tree mode (without -b) some in-tree files and also all out-of-tree files are ignored.
+    When in out-tree mode (with -b) the script does generate warnings.
+    """
+
+    def test_run(self):
+        """Test the various ways the script can be called in a simple top to bottom sequence."""
+        # an intree file can be checked by the script called from relative path, absolute path and from PATH
+        for base_script, base_file, rel_script, rel_file, rel_cwd in self.relative:
+            abs_script = infra.basepath(base_script)
+            abs_file = infra.basepath(base_file)
+            cwd = infra.basepath(rel_cwd)
+
+            _, m = call_script([rel_script, rel_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script([abs_script, rel_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script(["check-package", rel_file], self.WITH_UTILS_IN_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script([rel_script, abs_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script([abs_script, abs_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script(["check-package", abs_file], self.WITH_UTILS_IN_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+        # some intree files are ignored
+        _, m = call_script(["./utils/check-package", "package/pkg-generic.mk"], self.WITH_EMPTY_PATH, infra.basepath())
+        self.assert_file_was_ignored(m)
+
+        _, m = call_script(["./utils/check-package", "-b", "package/pkg-generic.mk"], self.WITH_EMPTY_PATH, infra.basepath())
+        self.assert_file_was_processed(m)
+
+        # an out-of-tree file can be checked by the script called from relative path, absolute path and from PATH
+        for base_script, base_file, rel_script, rel_file, rel_cwd in self.relative:
+            abs_script = infra.basepath(base_script)
+            abs_file = infra.basepath(base_file)
+            cwd = infra.basepath(rel_cwd)
+
+            _, m = call_script([rel_script, "-b", rel_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script([abs_script, "-b", rel_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script(["check-package", "-b", rel_file], self.WITH_UTILS_IN_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script([rel_script, "-b", abs_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script([abs_script, "-b", abs_file], self.WITH_EMPTY_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+            _, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, cwd)
+            self.assert_file_was_processed(m)
+
+        # out-of-tree files are are ignored without -b but can generate warnings with -b
+        abs_path = infra.filepath("tests/utils/br2-external")
+        rel_file = "Config.in"
+        abs_file = os.path.join(abs_path, rel_file)
+
+        _, m = call_script(["check-package", rel_file], self.WITH_UTILS_IN_PATH, abs_path)
+        self.assert_file_was_ignored(m)
+
+        _, m = call_script(["check-package", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath())
+        self.assert_file_was_ignored(m)
+
+        w, m = call_script(["check-package", "-b", rel_file], self.WITH_UTILS_IN_PATH, abs_path)
+        self.assert_file_was_processed(m)
+        self.assert_warnings_generated_for_file(m)
+        self.assertIn("{}:1: empty line at end of file".format(abs_file), w)
+
+        w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath())
+        self.assert_file_was_processed(m)
+        self.assert_warnings_generated_for_file(m)
+        self.assertIn("{}:1: empty line at end of file".format(abs_file), w)