From 54837759f36eddb80af22c8d73e103a948221dc7 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Mon, 19 Oct 2020 22:25:29 +0100 Subject: Tests: fixed unit.log print. --- test/test_ruby_isolation.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'test/test_ruby_isolation.py') diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py index 13ca0e16..bf934540 100644 --- a/test/test_ruby_isolation.py +++ b/test/test_ruby_isolation.py @@ -1,7 +1,10 @@ +import shutil import pytest from conftest import option +from conftest import unit_run +from conftest import unit_stop from unit.applications.lang.ruby import TestApplicationRuby from unit.feature.isolation import TestFeatureIsolation @@ -9,18 +12,22 @@ from unit.feature.isolation import TestFeatureIsolation class TestRubyIsolation(TestApplicationRuby): prerequisites = {'modules': {'ruby': 'any'}, 'features': ['isolation']} - isolation = TestFeatureIsolation() - @classmethod def setup_class(cls, complete_check=True): - unit = super().setup_class(complete_check=False) + check = super().setup_class(complete_check=False) + + unit = unit_run() + option.temp_dir = unit['temp_dir'] + + TestFeatureIsolation().check(option.available, unit['temp_dir']) - TestFeatureIsolation().check(cls.available, unit.temp_dir) + assert unit_stop() is None + shutil.rmtree(unit['temp_dir']) - return unit if not complete_check else unit.complete() + return check if not complete_check else check() def test_ruby_isolation_rootfs(self, is_su): - isolation_features = self.available['features']['isolation'].keys() + isolation_features = option.available['features']['isolation'].keys() if 'mnt' not in isolation_features: pytest.skip('requires mnt ns') -- cgit From 417f5d911ddb3a46b590d89e73313856a32ff435 Mon Sep 17 00:00:00 2001 From: Tiago Natel de Moura Date: Thu, 29 Oct 2020 14:31:37 +0000 Subject: Tests: added new ruby isolation test without namespaces. --- test/test_ruby_isolation.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'test/test_ruby_isolation.py') diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py index bf934540..79c94ba2 100644 --- a/test/test_ruby_isolation.py +++ b/test/test_ruby_isolation.py @@ -26,7 +26,7 @@ class TestRubyIsolation(TestApplicationRuby): return check if not complete_check else check() - def test_ruby_isolation_rootfs(self, is_su): + def test_ruby_isolation_rootfs_mount_namespace(self, is_su): isolation_features = option.available['features']['isolation'].keys() if 'mnt' not in isolation_features: @@ -55,3 +55,22 @@ class TestRubyIsolation(TestApplicationRuby): ) assert self.get()['status'] == 200, 'status int' + + def test_ruby_isolation_rootfs(self, is_su): + if not is_su: + pytest.skip('requires root') + return + + isolation = {'rootfs': option.test_dir} + + self.load('status_int', isolation=isolation) + + assert 'success' in self.conf( + '"/ruby/status_int/config.ru"', 'applications/status_int/script', + ) + + assert 'success' in self.conf( + '"/ruby/status_int"', 'applications/status_int/working_directory', + ) + + assert self.get()['status'] == 200, 'status int' -- cgit From 0390cb3a61051dd93e206d50591aff5759cf42fc Mon Sep 17 00:00:00 2001 From: Tiago Natel de Moura Date: Thu, 29 Oct 2020 20:30:53 +0000 Subject: Isolation: mounting of procfs by default when using "rootfs". --- test/test_ruby_isolation.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'test/test_ruby_isolation.py') diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py index 79c94ba2..69e25de9 100644 --- a/test/test_ruby_isolation.py +++ b/test/test_ruby_isolation.py @@ -29,20 +29,27 @@ class TestRubyIsolation(TestApplicationRuby): def test_ruby_isolation_rootfs_mount_namespace(self, is_su): isolation_features = option.available['features']['isolation'].keys() - if 'mnt' not in isolation_features: - pytest.skip('requires mnt ns') - if not is_su: - if 'user' not in isolation_features: - pytest.skip('requires unprivileged userns or root') - if not 'unprivileged_userns_clone' in isolation_features: pytest.skip('requires unprivileged userns or root') - isolation = { - 'namespaces': {'credential': not is_su, 'mount': True}, - 'rootfs': option.test_dir, - } + if 'user' not in isolation_features: + pytest.skip('user namespace is not supported') + + if 'mnt' not in isolation_features: + pytest.skip('mnt namespace is not supported') + + if 'pid' not in isolation_features: + pytest.skip('pid namespace is not supported') + + isolation = {'rootfs': option.test_dir} + + if not is_su: + isolation['namespaces'] = { + 'mount': True, + 'credential': True, + 'pid': True + } self.load('status_int', isolation=isolation) -- cgit