diff --git a/ekernel.py b/ekernel.py index 99d61db..308e815 100644 --- a/ekernel.py +++ b/ekernel.py @@ -398,7 +398,10 @@ def build (argv): # build os.chdir(kernel.src) out.einfo(f"building {out.teal(kernel.src)}") - subprocess.run(["make", "-j", str(args.jobs)], check=True) + margs = ["make", "-j", str(args.jobs)] + if args.quiet: + margs.append(">/dev/null") + subprocess.run(margs, check=True) @cli @efi @@ -495,7 +498,10 @@ def install (argv): # install modules os.chdir(kernel.src) out.einfo(f"installing modules {out.teal(kernel.modules)}") - subprocess.run(["make", "modules_install"], check=True) + margs = ["make", "modules_install"] + if args.quiet: + margs.append(">/dev/null") + subprocess.run(margs, check=True) # rebuild external modules eargs = ["emerge", "@module-rebuild"] @@ -643,7 +649,8 @@ def clean (argv): # remove files for k, v in rm.items(): - out.einfo(f"deleting {k}:") + if v: + out.einfo(f"deleting {k}:") for p in v: out.print(f" {out.red('✗')} {out.teal(p)}") if args.dry: continue @@ -871,7 +878,7 @@ def commit (argv): out.print(f" {out.green('✓')} {out.teal(kernel.config)}") # print message - if msg: + if msg.getvalue(): out.einfo("commit message:") for l in msg.getvalue().splitlines(): out.print(f" {out.teal(l)}" if l else "") @@ -891,7 +898,6 @@ def commit (argv): raise RuntimeError(e.stderr.decode()) @cli -@efi def update (argv): """Custom Gentoo EFI stub kernel updater.""" parser = argparse.ArgumentParser( diff --git a/tests/__init__.py b/test/__init__.py similarity index 100% rename from tests/__init__.py rename to test/__init__.py diff --git a/tests/data/__init__.py b/test/data/__init__.py similarity index 100% rename from tests/data/__init__.py rename to test/data/__init__.py diff --git a/tests/data/kernel.py b/test/data/kernel.py similarity index 100% rename from tests/data/kernel.py rename to test/data/kernel.py diff --git a/tests/test_build.py b/test/test_build.py similarity index 93% rename from tests/test_build.py rename to test/test_build.py index 3a7656e..dc425c0 100644 --- a/tests/test_build.py +++ b/test/test_build.py @@ -3,8 +3,8 @@ import subprocess import unittest from ekernel import Kernel -from tests import capture_stderr, Interceptor -import tests.data.kernel as data +from test import capture_stderr, Interceptor +import test.data.kernel as data import ekernel @@ -37,7 +37,7 @@ class Tests (unittest.TestCase): # make -j tracer, (args, kwargs) = next(trace_it) self.assertEqual(tracer.name, "subprocess.run") - self.assertEqual(args, (["make", "-j", self.jobs],)) + self.assertEqual(args, (["make", "-j", self.jobs, ">/dev/null"],)) self.assertEqual(kwargs, {"check": True}) self.assertTrue(self.kernel.bzImage.exists()) diff --git a/tests/test_clean.py b/test/test_clean.py similarity index 98% rename from tests/test_clean.py rename to test/test_clean.py index bcba23d..d588b82 100644 --- a/tests/test_clean.py +++ b/test/test_clean.py @@ -6,8 +6,8 @@ import sys import unittest from ekernel import Kernel -from tests import capture_stdout, colorless, Interceptor -import tests.data.kernel as data +from test import capture_stdout, colorless, Interceptor +import test.data.kernel as data import ekernel diff --git a/tests/test_commit.py b/test/test_commit.py similarity index 98% rename from tests/test_commit.py rename to test/test_commit.py index ef51921..9be13bb 100644 --- a/tests/test_commit.py +++ b/test/test_commit.py @@ -5,8 +5,8 @@ import sys import unittest from ekernel import Kernel -from tests import git, capture_stdout, capture_stderr, colorless -import tests.data.kernel as data +from test import git, capture_stdout, capture_stderr, colorless +import test.data.kernel as data import ekernel diff --git a/tests/test_configure.py b/test/test_configure.py similarity index 98% rename from tests/test_configure.py rename to test/test_configure.py index d29d4fc..99fd2ae 100644 --- a/tests/test_configure.py +++ b/test/test_configure.py @@ -4,8 +4,8 @@ import sys import unittest from ekernel import Kernel -from tests import capture_stdout, capture_stderr, colorless, Interceptor -import tests.data.kernel as data +from test import capture_stdout, capture_stderr, colorless, Interceptor +import test.data.kernel as data import ekernel diff --git a/tests/test_install.py b/test/test_install.py similarity index 97% rename from tests/test_install.py rename to test/test_install.py index 7d5e9c4..a5af267 100644 --- a/tests/test_install.py +++ b/test/test_install.py @@ -4,8 +4,8 @@ import sys import unittest from ekernel import Kernel -from tests import capture_stderr, Interceptor -import tests.data.kernel as data +from test import capture_stderr, Interceptor +import test.data.kernel as data import ekernel @@ -63,7 +63,7 @@ class Tests (unittest.TestCase): # make modules_install tracer, (args, kwargs) = next(trace_it) self.assertEqual(tracer.name, "subprocess.run") - self.assertEqual(args, (["make", "modules_install"],)) + self.assertEqual(args, (["make", "modules_install", ">/dev/null"],)) self.assertEqual(kwargs, {"check": True}) # emerge @module-rebuild tracer, (args, kwargs) = next(trace_it) diff --git a/tests/test_interceptor.py b/test/test_interceptor.py similarity index 99% rename from tests/test_interceptor.py rename to test/test_interceptor.py index 556595d..67d60d1 100644 --- a/tests/test_interceptor.py +++ b/test/test_interceptor.py @@ -2,7 +2,7 @@ import os import subprocess import unittest -from tests import Interceptor +from test import Interceptor class Foo: diff --git a/tests/test_kernel.py b/test/test_kernel.py similarity index 75% rename from tests/test_kernel.py rename to test/test_kernel.py index 0716827..17c0526 100644 --- a/tests/test_kernel.py +++ b/test/test_kernel.py @@ -3,8 +3,8 @@ import unittest from packaging.version import Version -from tests import Interceptor -import tests.data.kernel as data +from test import Interceptor +import test.data.kernel as data import ekernel @@ -25,51 +25,54 @@ class Tests (unittest.TestCase): data.boot.parent / f"gentoo-{v.base_version}.efi" ) - def test_paths (self): + def test_kernel_paths (self): self.assertEqual(ekernel.Kernel.src, data.src) self.assertEqual(ekernel.Kernel.linux, data.linux) self.assertEqual(ekernel.Kernel.modules, data.modules) - def test_version (self): + def test_kernel_version (self): self.assertEqual(ekernel.version("0.0.1-gentoo"), Version("0.0.1")) - def test_constructor (self): + def test_kernel_constructor (self): self.check_vars( ekernel.Kernel(data.current), ekernel.Kernel.current().src ) - def test_list (self): + def test_kernel_list (self): self.assertEqual(ekernel.Kernel.list(), data.kernels) - def test_list_ascending (self): + def test_kernel_list_ascending (self): self.assertEqual( ekernel.Kernel.list(descending=False), list(reversed(data.kernels)) ) - def test_current (self): + def test_kernel_current (self): self.check_vars(ekernel.Kernel.current(), data.current) - def test_latest (self): + def test_kernel_latest (self): self.check_vars(ekernel.Kernel.latest(), data.latest) - def test_eq (self): + def test_kernel_eq (self): self.assertEqual( ekernel.Kernel.current(), ekernel.Kernel(data.current) ) - def test_neq (self): + def test_kernel_neq (self): self.assertNotEqual(ekernel.Kernel.current(), ekernel.Kernel.latest()) - def test_bootable (self): + def test_kernel_bootable (self): self.assertFalse(ekernel.Kernel.latest().bootable()) self.assertTrue(ekernel.Kernel.current().bootable()) - def test_current_missing (self): + def test_kernel_current_missing (self): kernel = ekernel.Kernel.current() shutil.rmtree(kernel.src) with self.assertRaises(ValueError) as e: ekernel.Kernel.current() - self.assertEqual(str(e.exception), f"error: missing source {kernel.src}") + self.assertEqual( + str(e.exception), + f"error: missing source {kernel.src}" + ) diff --git a/tests/test_update.py b/test/test_update.py similarity index 97% rename from tests/test_update.py rename to test/test_update.py index 1cc7e20..f8b56bd 100644 --- a/tests/test_update.py +++ b/test/test_update.py @@ -4,8 +4,8 @@ import sys import unittest from ekernel import Kernel -from tests import capture_stdout, capture_stderr, git, Interceptor -import tests.data.kernel as data +from test import capture_stdout, capture_stderr, git, Interceptor +import test.data.kernel as data import ekernel