Juju Charms Collection
ntp package

Merge lp:~whitmo/charms/trusty/ntp/test-fix into lp:~brad-marshall/charms/trusty/ntp/add-auto-peers

  1. Trusty Tahr (14.04)
  2. test-fix
  3. Merge into add-auto-peers
Proposed by Whit Morriss
Status: Merged
Merged at revision: 37
Proposed branch: lp:~whitmo/charms/trusty/ntp/test-fix
Merge into: lp:~brad-marshall/charms/trusty/ntp/add-auto-peers
Diff against target: 17 lines (+2/-2)
1 file modified
tests/10-deploy-test.py (+2/-2)
To merge this branch: bzr merge lp:~whitmo/charms/trusty/ntp/test-fix
Reviewer Review Type Date Requested Status
Brad Marshall Pending
Review via email: mp+254802@code.launchpad.net

Description of the change

Fixes functional test failure caused by old variable name.

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
1=== modified file 'tests/10-deploy-test.py'
2--- tests/10-deploy-test.py 2015-03-27 06:24:40 +0000
3+++ tests/10-deploy-test.py 2015-03-31 16:55:25 +0000
4@@ -77,11 +77,11 @@
5 print(message)
6 amulet.raise_status(amulet.FAIL, msg=message)
7
8-# The ubuntu cloud image does not have ntp installed by default,
9+# The ubuntu cloud image does not have ntp installed by default,
10 # and therefore does not have the /etc/ntp.conf file.
11
12 # Read in the ntp configuration file from the ubuntu unit.
13-configuration_file = ubuntu_unit.file_contents('/etc/ntp.conf')
14+configuration_file = ubuntu_unit_0.file_contents('/etc/ntp.conf')
15 # This call will fail with an IO exception if the file does not exist.
16
17 # Search for ntp server 0 in the config file, raise an exception if not found.

Subscribers

People subscribed via source and target branches

to all changes: