proto.py (1050:5b9ec6a8ae06) proto.py (1303:248eeec4c272)
1import re
2import time
3from unit.control import TestControl
4
5
6class TestApplicationProto(TestControl):
7 def sec_epoch(self):
8 return time.mktime(time.gmtime())

--- 11 unchanged lines hidden (view full) ---

20
21 if found is not None:
22 break
23
24 time.sleep(0.1)
25
26 return found
27
1import re
2import time
3from unit.control import TestControl
4
5
6class TestApplicationProto(TestControl):
7 def sec_epoch(self):
8 return time.mktime(time.gmtime())

--- 11 unchanged lines hidden (view full) ---

20
21 if found is not None:
22 break
23
24 time.sleep(0.1)
25
26 return found
27
28 def _load_conf(self, conf):
28 def _load_conf(self, conf, **kwargs):
29 if 'applications' in conf:
30 for app in conf['applications'].keys():
31 app_conf = conf['applications'][app]
32 if 'user' in kwargs:
33 app_conf['user'] = kwargs['user']
34
35 if 'group' in kwargs:
36 app_conf['group'] = kwargs['group']
37
38 if 'isolation' in kwargs:
39 app_conf['isolation'] = kwargs['isolation']
40
29 self.assertIn(
30 'success', self.conf(conf), 'load application configuration'
31 )
41 self.assertIn(
42 'success', self.conf(conf), 'load application configuration'
43 )