renamed test directory
This commit is contained in:
parent
0b0d52c8b0
commit
28b33eaf1c
14
ekernel.py
14
ekernel.py
@ -398,7 +398,10 @@ def build (argv):
|
|||||||
# build
|
# build
|
||||||
os.chdir(kernel.src)
|
os.chdir(kernel.src)
|
||||||
out.einfo(f"building {out.teal(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
|
@cli
|
||||||
@efi
|
@efi
|
||||||
@ -495,7 +498,10 @@ def install (argv):
|
|||||||
# install modules
|
# install modules
|
||||||
os.chdir(kernel.src)
|
os.chdir(kernel.src)
|
||||||
out.einfo(f"installing modules {out.teal(kernel.modules)}")
|
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
|
# rebuild external modules
|
||||||
eargs = ["emerge", "@module-rebuild"]
|
eargs = ["emerge", "@module-rebuild"]
|
||||||
@ -643,6 +649,7 @@ def clean (argv):
|
|||||||
|
|
||||||
# remove files
|
# remove files
|
||||||
for k, v in rm.items():
|
for k, v in rm.items():
|
||||||
|
if v:
|
||||||
out.einfo(f"deleting {k}:")
|
out.einfo(f"deleting {k}:")
|
||||||
for p in v:
|
for p in v:
|
||||||
out.print(f" {out.red('✗')} {out.teal(p)}")
|
out.print(f" {out.red('✗')} {out.teal(p)}")
|
||||||
@ -871,7 +878,7 @@ def commit (argv):
|
|||||||
out.print(f" {out.green('✓')} {out.teal(kernel.config)}")
|
out.print(f" {out.green('✓')} {out.teal(kernel.config)}")
|
||||||
|
|
||||||
# print message
|
# print message
|
||||||
if msg:
|
if msg.getvalue():
|
||||||
out.einfo("commit message:")
|
out.einfo("commit message:")
|
||||||
for l in msg.getvalue().splitlines():
|
for l in msg.getvalue().splitlines():
|
||||||
out.print(f" {out.teal(l)}" if l else "")
|
out.print(f" {out.teal(l)}" if l else "")
|
||||||
@ -891,7 +898,6 @@ def commit (argv):
|
|||||||
raise RuntimeError(e.stderr.decode())
|
raise RuntimeError(e.stderr.decode())
|
||||||
|
|
||||||
@cli
|
@cli
|
||||||
@efi
|
|
||||||
def update (argv):
|
def update (argv):
|
||||||
"""Custom Gentoo EFI stub kernel updater."""
|
"""Custom Gentoo EFI stub kernel updater."""
|
||||||
parser = argparse.ArgumentParser(
|
parser = argparse.ArgumentParser(
|
||||||
|
@ -3,8 +3,8 @@ import subprocess
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from ekernel import Kernel
|
from ekernel import Kernel
|
||||||
from tests import capture_stderr, Interceptor
|
from test import capture_stderr, Interceptor
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
||||||
@ -37,7 +37,7 @@ class Tests (unittest.TestCase):
|
|||||||
# make -j <jobs>
|
# make -j <jobs>
|
||||||
tracer, (args, kwargs) = next(trace_it)
|
tracer, (args, kwargs) = next(trace_it)
|
||||||
self.assertEqual(tracer.name, "subprocess.run")
|
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.assertEqual(kwargs, {"check": True})
|
||||||
self.assertTrue(self.kernel.bzImage.exists())
|
self.assertTrue(self.kernel.bzImage.exists())
|
||||||
|
|
@ -6,8 +6,8 @@ import sys
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from ekernel import Kernel
|
from ekernel import Kernel
|
||||||
from tests import capture_stdout, colorless, Interceptor
|
from test import capture_stdout, colorless, Interceptor
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
@ -5,8 +5,8 @@ import sys
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from ekernel import Kernel
|
from ekernel import Kernel
|
||||||
from tests import git, capture_stdout, capture_stderr, colorless
|
from test import git, capture_stdout, capture_stderr, colorless
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
@ -4,8 +4,8 @@ import sys
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from ekernel import Kernel
|
from ekernel import Kernel
|
||||||
from tests import capture_stdout, capture_stderr, colorless, Interceptor
|
from test import capture_stdout, capture_stderr, colorless, Interceptor
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
@ -4,8 +4,8 @@ import sys
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from ekernel import Kernel
|
from ekernel import Kernel
|
||||||
from tests import capture_stderr, Interceptor
|
from test import capture_stderr, Interceptor
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ class Tests (unittest.TestCase):
|
|||||||
# make modules_install
|
# make modules_install
|
||||||
tracer, (args, kwargs) = next(trace_it)
|
tracer, (args, kwargs) = next(trace_it)
|
||||||
self.assertEqual(tracer.name, "subprocess.run")
|
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})
|
self.assertEqual(kwargs, {"check": True})
|
||||||
# emerge @module-rebuild
|
# emerge @module-rebuild
|
||||||
tracer, (args, kwargs) = next(trace_it)
|
tracer, (args, kwargs) = next(trace_it)
|
@ -2,7 +2,7 @@ import os
|
|||||||
import subprocess
|
import subprocess
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from tests import Interceptor
|
from test import Interceptor
|
||||||
|
|
||||||
class Foo:
|
class Foo:
|
||||||
|
|
@ -3,8 +3,8 @@ import unittest
|
|||||||
|
|
||||||
from packaging.version import Version
|
from packaging.version import Version
|
||||||
|
|
||||||
from tests import Interceptor
|
from test import Interceptor
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
||||||
@ -25,51 +25,54 @@ class Tests (unittest.TestCase):
|
|||||||
data.boot.parent / f"gentoo-{v.base_version}.efi"
|
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.src, data.src)
|
||||||
self.assertEqual(ekernel.Kernel.linux, data.linux)
|
self.assertEqual(ekernel.Kernel.linux, data.linux)
|
||||||
self.assertEqual(ekernel.Kernel.modules, data.modules)
|
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"))
|
self.assertEqual(ekernel.version("0.0.1-gentoo"), Version("0.0.1"))
|
||||||
|
|
||||||
def test_constructor (self):
|
def test_kernel_constructor (self):
|
||||||
self.check_vars(
|
self.check_vars(
|
||||||
ekernel.Kernel(data.current),
|
ekernel.Kernel(data.current),
|
||||||
ekernel.Kernel.current().src
|
ekernel.Kernel.current().src
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_list (self):
|
def test_kernel_list (self):
|
||||||
self.assertEqual(ekernel.Kernel.list(), data.kernels)
|
self.assertEqual(ekernel.Kernel.list(), data.kernels)
|
||||||
|
|
||||||
def test_list_ascending (self):
|
def test_kernel_list_ascending (self):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
ekernel.Kernel.list(descending=False),
|
ekernel.Kernel.list(descending=False),
|
||||||
list(reversed(data.kernels))
|
list(reversed(data.kernels))
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_current (self):
|
def test_kernel_current (self):
|
||||||
self.check_vars(ekernel.Kernel.current(), data.current)
|
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)
|
self.check_vars(ekernel.Kernel.latest(), data.latest)
|
||||||
|
|
||||||
def test_eq (self):
|
def test_kernel_eq (self):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
ekernel.Kernel.current(),
|
ekernel.Kernel.current(),
|
||||||
ekernel.Kernel(data.current)
|
ekernel.Kernel(data.current)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_neq (self):
|
def test_kernel_neq (self):
|
||||||
self.assertNotEqual(ekernel.Kernel.current(), ekernel.Kernel.latest())
|
self.assertNotEqual(ekernel.Kernel.current(), ekernel.Kernel.latest())
|
||||||
|
|
||||||
def test_bootable (self):
|
def test_kernel_bootable (self):
|
||||||
self.assertFalse(ekernel.Kernel.latest().bootable())
|
self.assertFalse(ekernel.Kernel.latest().bootable())
|
||||||
self.assertTrue(ekernel.Kernel.current().bootable())
|
self.assertTrue(ekernel.Kernel.current().bootable())
|
||||||
|
|
||||||
def test_current_missing (self):
|
def test_kernel_current_missing (self):
|
||||||
kernel = ekernel.Kernel.current()
|
kernel = ekernel.Kernel.current()
|
||||||
shutil.rmtree(kernel.src)
|
shutil.rmtree(kernel.src)
|
||||||
with self.assertRaises(ValueError) as e:
|
with self.assertRaises(ValueError) as e:
|
||||||
ekernel.Kernel.current()
|
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}"
|
||||||
|
)
|
@ -4,8 +4,8 @@ import sys
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from ekernel import Kernel
|
from ekernel import Kernel
|
||||||
from tests import capture_stdout, capture_stderr, git, Interceptor
|
from test import capture_stdout, capture_stderr, git, Interceptor
|
||||||
import tests.data.kernel as data
|
import test.data.kernel as data
|
||||||
|
|
||||||
import ekernel
|
import ekernel
|
||||||
|
|
Loading…
Reference in New Issue
Block a user