summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-05-03 14:49:16 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-05-03 14:49:16 -0700
commit5118a33b22a376954bd048c3142f2d3f7f55d003 (patch)
tree625c491ecdeb0432360df02777f33f859d55a22b /tests
parentc972396ecccb4b67eafc038a482ffeaa1df2c93e (diff)
downloadvyos-cloud-init-5118a33b22a376954bd048c3142f2d3f7f55d003.tar.gz
vyos-cloud-init-5118a33b22a376954bd048c3142f2d3f7f55d003.zip
Rename the merge cc sample function name.
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_merging.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py
index cff8ac12..dd8c2eee 100644
--- a/tests/unittests/test_merging.py
+++ b/tests/unittests/test_merging.py
@@ -64,7 +64,7 @@ class TestSimpleRun(helpers.ResourceUsingTestCase):
tests.append(entry)
return tests
- def test_merge_samples(self):
+ def test_merge_cc_samples(self):
tests = self._load_merge_files()
paths = c_helpers.Paths({})
cc_handler = cloud_config.CloudConfigPartHandler(paths)