Merge ~hloeung/ntp-charm:master into ntp-charm:master

Proposed by Haw Loeung on 2019-08-01
Status: Merged
Approved by: Alexandre Gomes on 2019-08-01
Approved revision: d7c87602289d761ccf2ece7e61238454e2626fb2
Merged at revision: e2b0153add2c36a812cede2c851ced180286077f
Proposed branch: ~hloeung/ntp-charm:master
Merge into: ntp-charm:master
Diff against target: 42 lines (+5/-0)
3 files modified
unit_tests/test_action_diagnostics.py (+1/-0)
unit_tests/test_ntp_scoring.py (+2/-0)
unit_tests/test_ntp_source_score.py (+2/-0)
Reviewer Review Type Date Requested Status
Canonical IS Reviewers 2019-08-01 Pending
NTP charm developers 2019-08-01 Pending
Review via email: mp+370889@code.launchpad.net

Commit message

Fixed path to libraries

To post a comment you must log in.

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Change successfully merged at revision e2b0153add2c36a812cede2c851ced180286077f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/unit_tests/test_action_diagnostics.py b/unit_tests/test_action_diagnostics.py
2index 5e62d04..86b3d17 100644
3--- a/unit_tests/test_action_diagnostics.py
4+++ b/unit_tests/test_action_diagnostics.py
5@@ -10,6 +10,7 @@ import sys
6 # The templating engine isn't required for these tests.
7 sys.modules['jinja2'] = mock.MagicMock()
8
9+sys.path.append('actions')
10 import diagnostics # NOQA: E402
11
12
13diff --git a/unit_tests/test_ntp_scoring.py b/unit_tests/test_ntp_scoring.py
14index 901f50a..dd704d3 100644
15--- a/unit_tests/test_ntp_scoring.py
16+++ b/unit_tests/test_ntp_scoring.py
17@@ -2,8 +2,10 @@
18
19 from random import shuffle
20 from unittest.mock import Mock, patch
21+import sys
22 import unittest
23
24+sys.path.append('lib')
25 import ntp_scoring
26
27
28diff --git a/unit_tests/test_ntp_source_score.py b/unit_tests/test_ntp_source_score.py
29index 378faa0..9804955 100644
30--- a/unit_tests/test_ntp_source_score.py
31+++ b/unit_tests/test_ntp_source_score.py
32@@ -2,8 +2,10 @@
33
34 from unittest.mock import patch
35 import math
36+import sys
37 import unittest
38
39+sys.path.append('lib')
40 from ntp_source_score import (
41 get_delay_score,
42 get_source_delays,

Subscribers

People subscribed via source and target branches