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
77
    print(message)
77
    print(message)
6
78
    amulet.raise_status(amulet.FAIL, msg=message)
78
    amulet.raise_status(amulet.FAIL, msg=message)
7
79
79
9
80
# The ubuntu cloud image does not have ntp installed by default, 
80
# The ubuntu cloud image does not have ntp installed by default,
10
81
# and therefore does not have the /etc/ntp.conf file.
81
# and therefore does not have the /etc/ntp.conf file.
11
82
82
12
83
# Read in the ntp configuration file from the ubuntu unit.
83
# Read in the ntp configuration file from the ubuntu unit.
14
84
configuration_file = ubuntu_unit.file_contents('/etc/ntp.conf')
84
configuration_file = ubuntu_unit_0.file_contents('/etc/ntp.conf')
15
85
# This call will fail with an IO exception if the file does not exist.
85
# This call will fail with an IO exception if the file does not exist.
16
86
86
17
87
# Search for ntp server 0 in the config file, raise an exception if not found.
87
# Search for ntp server 0 in the config file, raise an exception if not found.
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brad Marshall		2015-03-31	Pending
Review via email: mp+254802@code.launchpad.net
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	77	print(message)	77	print(message)
6	78	amulet.raise_status(amulet.FAIL, msg=message)	78	amulet.raise_status(amulet.FAIL, msg=message)
7	79		79
9	80	# The ubuntu cloud image does not have ntp installed by default,	80	# The ubuntu cloud image does not have ntp installed by default,
10	81	# and therefore does not have the /etc/ntp.conf file.	81	# and therefore does not have the /etc/ntp.conf file.
11	82		82
12	83	# Read in the ntp configuration file from the ubuntu unit.	83	# Read in the ntp configuration file from the ubuntu unit.
14	84	configuration_file = ubuntu_unit.file_contents('/etc/ntp.conf')	84	configuration_file = ubuntu_unit_0.file_contents('/etc/ntp.conf')
15	85	# This call will fail with an IO exception if the file does not exist.	85	# This call will fail with an IO exception if the file does not exist.
16	86		86
17	87	# Search for ntp server 0 in the config file, raise an exception if not found.	87	# Search for ntp server 0 in the config file, raise an exception if not found.