summaryrefslogtreecommitdiff
path: root/tests/unittests
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-28 15:13:19 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-28 15:13:19 -0700
commitcb7274fa1ded413b0c5a19152ddf6e791aba98cf (patch)
tree03fa3e91a40151eea61f3b4c1ad6549c2dba3e87 /tests/unittests
parent1c2c043b970a62f82b5e19e368b348d48ebbb638 (diff)
downloadvyos-cloud-init-cb7274fa1ded413b0c5a19152ddf6e791aba98cf.tar.gz
vyos-cloud-init-cb7274fa1ded413b0c5a19152ddf6e791aba98cf.zip
1. Update with smosers code review and comments (and put some of those comments into the files)
2. Rename consume() to consume_userdata() as it helps in figuring out what this does. 3. Fixup the tests due to #2
Diffstat (limited to 'tests/unittests')
-rw-r--r--tests/unittests/test_userdata.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py
index eeddde7d..861642b6 100644
--- a/tests/unittests/test_userdata.py
+++ b/tests/unittests/test_userdata.py
@@ -68,7 +68,7 @@ class TestConsumeUserData(MockerTestCase):
log_file = self.capture_log(logging.WARNING)
ci.fetch()
- ci.consume()
+ ci.consume_userdata()
self.assertIn(
"Unhandled non-multipart (text/x-not-multipart) userdata:",
log_file.getvalue())
@@ -85,7 +85,7 @@ class TestConsumeUserData(MockerTestCase):
log_file = self.capture_log(logging.WARNING)
ci.fetch()
- ci.consume()
+ ci.consume_userdata()
self.assertIn(
"Unhandled unknown content-type (text/plain)",
log_file.getvalue())
@@ -104,7 +104,7 @@ class TestConsumeUserData(MockerTestCase):
log_file = self.capture_log(logging.WARNING)
ci.fetch()
- ci.consume()
+ ci.consume_userdata()
self.assertEqual("", log_file.getvalue())
def test_mime_text_x_shellscript(self):
@@ -122,7 +122,7 @@ class TestConsumeUserData(MockerTestCase):
log_file = self.capture_log(logging.WARNING)
ci.fetch()
- ci.consume()
+ ci.consume_userdata()
self.assertEqual("", log_file.getvalue())
def test_mime_text_plain_shell(self):
@@ -140,5 +140,5 @@ class TestConsumeUserData(MockerTestCase):
log_file = self.capture_log(logging.WARNING)
ci.fetch()
- ci.consume()
+ ci.consume_userdata()
self.assertEqual("", log_file.getvalue())