From 5118a33b22a376954bd048c3142f2d3f7f55d003 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 3 May 2013 14:49:16 -0700
Subject: Rename the merge cc sample function name.

---
 tests/unittests/test_merging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

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)
-- 
cgit v1.2.3