Merge lp:~johnsca/charms/trusty/nagios/pagerduty-test-race into lp:~brad-marshall/charms/trusty/nagios/add-extra-config-options

[Cory Johns]

Work-around for race condition in pagerduty test

Unmerged revisions

49. By Cory Johns on 2015-08-27

Work-around for race condition in pagerduty test

=== modified file 'tests/24-pagerduty-test'
--- tests/24-pagerduty-test	2015-07-22 06:19:11 +0000
+++ tests/24-pagerduty-test	2015-08-27 15:57:56 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+from time import sleep
 import amulet
 # import requests
 
@@ -33,21 +34,30 @@
 
 
 def test_pagerduty_path_exists():
-    pagerduty_path = nagios_unit.run('config-get pagerduty_path')
-    try:
-        pagerduty_file = nagios_unit.file(pagerduty_path[0])
-    except OSError:
+    for i in range(3):  # try three times before failing
+        pagerduty_path = nagios_unit.run('config-get pagerduty_path')
+        try:
+            nagios_unit.file(pagerduty_path[0])
+            break
+        except OSError:
+            sleep(5)
+    else:
         message = "Can't find pagerduty directory"
         amulet.raise_status(amulet.FAIL, msg=message)
 
 
 def test_pagerduty_config():
-    pagerduty_cfg = '/etc/nagios3/conf.d/pagerduty_nagios.cfg'
-    try:
-        pagerduty_cfg_file = nagios_unit.file(pagerduty_cfg)
-    except OSError:
+    for i in range(3):  # try three times before failing
+        pagerduty_cfg = '/etc/nagios3/conf.d/pagerduty_nagios.cfg'
+        try:
+            nagios_unit.file(pagerduty_cfg)
+            break
+        except OSError:
+            sleep(5)
+    else:
         message = "Can't find pagerduty config file"
         amulet.raise_status(amulet.FAIL, msg=message)
 
+
 test_pagerduty_path_exists()
 test_pagerduty_config()