Merge pull request #326 from yuvipanda/less-systemd

Use c.Spawner to set mem_limit & cpu_limit
This commit is contained in:
Tim Head
2019-05-20 13:30:55 +02:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -66,7 +66,7 @@ def test_default_memory_limit():
Test default per user memory limit
"""
c = apply_mock_config({})
assert c.SystemdSpawner.mem_limit is None
assert c.Spawner.mem_limit is None
def test_set_memory_limit():
@@ -74,7 +74,7 @@ def test_set_memory_limit():
Test setting per user memory limit
"""
c = apply_mock_config({'limits': {'memory': '42G'}})
assert c.SystemdSpawner.mem_limit == '42G'
assert c.Spawner.mem_limit == '42G'
def test_app_default():

View File

@@ -162,8 +162,8 @@ def update_limits(c, config):
"""
limits = config['limits']
c.SystemdSpawner.mem_limit = limits['memory']
c.SystemdSpawner.cpu_limit = limits['cpu']
c.Spawner.mem_limit = limits['memory']
c.Spawner.cpu_limit = limits['cpu']
def update_user_environment(c, config):