|
@@ -93,7 +93,10 @@ class TestHiveServer(RMFTestCase):
|
|
|
self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/hive/hive-server.pid`',
|
|
|
not_if = '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1) || ( sleep 5 && ! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1) )',
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)',)
|
|
|
+ self.assertResourceCalled('Execute', '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)',
|
|
|
+ tries = 20,
|
|
|
+ try_sleep = 3,
|
|
|
+ )
|
|
|
self.assertResourceCalled('File', '/var/run/hive/hive-server.pid',
|
|
|
action = ['delete'],
|
|
|
)
|
|
@@ -164,7 +167,10 @@ class TestHiveServer(RMFTestCase):
|
|
|
self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/hive/hive-server.pid`',
|
|
|
not_if = '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1) || ( sleep 5 && ! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1) )',
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)',)
|
|
|
+ self.assertResourceCalled('Execute', '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)',
|
|
|
+ tries = 20,
|
|
|
+ try_sleep = 3,
|
|
|
+ )
|
|
|
self.assertResourceCalled('File', '/var/run/hive/hive-server.pid',
|
|
|
action = ['delete'],
|
|
|
)
|