hw-health-charm

Merge ~peter-sabaini/charm-hw-health:add-mdadm-checks into ~afreiberger/charm-hw-health:add-mdadm-checks

  1. Git
  2. lp:~peter-sabaini/charm-hw-health
  3. add-mdadm-checks
  4. Merge into add-mdadm-checks
Proposed by Peter Sabaini
Status: Merged
Merge reported by: Drew Freiberger
Merged at revision: b0adb6ff24d691867875383d6e97ad54af85a4e4
Proposed branch: ~peter-sabaini/charm-hw-health:add-mdadm-checks
Merge into: ~afreiberger/charm-hw-health:add-mdadm-checks
Diff against target: 46 lines (+8/-4)
1 file modified
src/tests/unit/test_cron_mdadm.py (+8/-4)
Reviewer Review Type Date Requested Status
Drew Freiberger Pending
Review via email: mp+378123@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/unit/test_cron_mdadm.py b/src/tests/unit/test_cron_mdadm.py
2index 75d291c..9ba6648 100644
3--- a/src/tests/unit/test_cron_mdadm.py
4+++ b/src/tests/unit/test_cron_mdadm.py
5@@ -1,5 +1,6 @@
6 import io
7 import os
8+import pathlib
9 import subprocess
10 import sys # noqa: F401
11 import unittest
12@@ -9,6 +10,9 @@ sys.path.append('files/mdadm')
13 import cron_mdadm # noqa: E402
14
15
16+TESTS_DIR = pathlib.Path(__file__).parent.parent
17+
18+
19 class TestCronMdadm(unittest.TestCase):
20 @mock.patch('os.path.exists')
21 @mock.patch('subprocess.check_output')
22@@ -45,12 +49,12 @@ class TestCronMdadm(unittest.TestCase):
23 class Test_Popen(object):
24 def __init__(cls):
25 test_output = os.path.join(
26- os.getcwd(), 'tests', 'hw-health-samples', 'mdadm.output')
27+ TESTS_DIR, 'hw-health-samples', 'mdadm.output')
28 cls.stdout = io.FileIO(test_output)
29 cls.wait = lambda: 0
30
31 test_output = os.path.join(
32- os.getcwd(), 'tests', 'hw-health-samples', 'mdadm.output')
33+ TESTS_DIR, 'hw-health-samples', 'mdadm.output')
34 with open(test_output, 'r') as fd:
35 mdadm_details.return_value = ''.join(fd.readlines()).encode()
36 devices.return_value = set(['/dev/md0', '/dev/md1', '/dev/md2'])
37@@ -88,8 +92,8 @@ class TestCronMdadm(unittest.TestCase):
38 @mock.patch('subprocess.check_output')
39 def test_parse_output_degraded(self, mdadm_details, devices, genout):
40 test_output = os.path.join(
41- os.getcwd(), 'tests', 'hw-health-samples',
42- 'mdadm.output.critical.1')
43+ TESTS_DIR, 'hw-health-samples',
44+ 'mdadm.output.critical')
45 with open(test_output, 'r') as fd:
46 mdadm_details.return_value = ''.join(fd.readlines()).encode()
47

Subscribers

People subscribed via source and target branches

to all changes: