summaryrefslogtreecommitdiff
path: root/tests/unittests/test_runs/test_simple_run.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-09-26 16:40:07 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-09-26 16:40:07 -0700
commit4a5d5a044db9e77b931fb4df93f7c01b02021f44 (patch)
tree24b67e58e2c5c193dc2b98c1a88ed1cf8e2a4a70 /tests/unittests/test_runs/test_simple_run.py
parentf31a4e80aaaafca79eb6c808c81a6067f0c493b8 (diff)
downloadvyos-cloud-init-4a5d5a044db9e77b931fb4df93f7c01b02021f44.tar.gz
vyos-cloud-init-4a5d5a044db9e77b931fb4df93f7c01b02021f44.zip
Fixup some pylint warnings.
Diffstat (limited to 'tests/unittests/test_runs/test_simple_run.py')
-rw-r--r--tests/unittests/test_runs/test_simple_run.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/unittests/test_runs/test_simple_run.py b/tests/unittests/test_runs/test_simple_run.py
index 33dd3ca2..7f646b54 100644
--- a/tests/unittests/test_runs/test_simple_run.py
+++ b/tests/unittests/test_runs/test_simple_run.py
@@ -1,6 +1,3 @@
-from mocker import MockerTestCase
-
-import mocker
import sys
import os
@@ -19,7 +16,7 @@ from cloudinit import stages
from cloudinit.settings import (PER_INSTANCE)
-class TestSimpleRunDistro(helpers.FilesystemMockingTestCase):
+class TestSimpleRun(helpers.FilesystemMockingTestCase):
def _patchIn(self, root):
self.restore()
self.patchOS(root)
@@ -76,13 +73,14 @@ class TestSimpleRunDistro(helpers.FilesystemMockingTestCase):
initer.update()
self.assertTrue(os.path.islink("var/lib/cloud/instance"))
- (ran, results) = initer.cloudify().run('consume_userdata',
- initer.consume_userdata,
- args=[PER_INSTANCE],
- freq=PER_INSTANCE)
+ initer.cloudify().run('consume_userdata',
+ initer.consume_userdata,
+ args=[PER_INSTANCE],
+ freq=PER_INSTANCE)
mods = stages.Modules(initer)
(which_ran, failures) = mods.run_section('cloud_init_modules')
+ self.assertTrue(len(failures) == 0)
self.assertTrue(os.path.exists('/etc/blah.ini'))
self.assertIn('write-files', which_ran)
contents = util.load_file('/etc/blah.ini')