From a6b269011b2f1e84c650239065e56778591f087e Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 30 Oct 2012 11:03:10 -0400
Subject: removed support for info/:info files

---
 .../Testlib/TestServer/TestPlugin/Testhelpers.py   | 55 ++++++----------------
 1 file changed, 14 insertions(+), 41 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
index 3d4df3e0b..290bd7d5c 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
@@ -1636,25 +1636,25 @@ class TestEntrySet(TestDebuggable):
             eset.reset_metadata.reset_mock()
             eset.entry_init.reset_mock()
 
-        for fname in ["info", "info.xml", ":info"]:
-            for evt in ["exists", "created", "changed"]:
-                reset()
-                event = Mock()
-                event.code2str.return_value = evt
-                event.filename = fname
-                eset.handle_event(event)
-                eset.update_metadata.assert_called_with(event)
-                self.assertFalse(eset.entry_init.called)
-                self.assertFalse(eset.reset_metadata.called)
-
+        fname = "info.xml"
+        for evt in ["exists", "created", "changed"]:
             reset()
             event = Mock()
-            event.code2str.return_value = "deleted"
+            event.code2str.return_value = evt
             event.filename = fname
             eset.handle_event(event)
-            eset.reset_metadata.assert_called_with(event)
+            eset.update_metadata.assert_called_with(event)
             self.assertFalse(eset.entry_init.called)
-            self.assertFalse(eset.update_metadata.called)
+            self.assertFalse(eset.reset_metadata.called)
+
+        reset()
+        event = Mock()
+        event.code2str.return_value = "deleted"
+        event.filename = fname
+        eset.handle_event(event)
+        eset.reset_metadata.assert_called_with(event)
+        self.assertFalse(eset.entry_init.called)
+        self.assertFalse(eset.update_metadata.called)
 
         for evt in ["exists", "created", "changed"]:
             reset()
@@ -1813,25 +1813,6 @@ class TestEntrySet(TestDebuggable):
         self.assertFalse(mock_InfoXML.called)
         eset.infoxml.HandleEvent.assert_called_with(event)
 
-        for fname in [':info', 'info']:
-            event = Mock()
-            event.filename = fname
-
-            idata = ["owner:owner",
-                     "group:             GROUP",
-                     "mode: 775",
-                     "important:     true",
-                     "bogus: line"]
-            mock_open.return_value.readlines.return_value = idata
-            eset.metadata = default_path_metadata()
-            eset.update_metadata(event)
-            expected = default_path_metadata()
-            expected['owner'] = 'owner'
-            expected['group'] = 'GROUP'
-            expected['mode'] = '0775'
-            expected['important'] = 'true'
-            self.assertItemsEqual(eset.metadata, expected)
-
     @patch("Bcfg2.Server.Plugin.helpers.default_path_metadata")
     def test_reset_metadata(self, mock_default_path_metadata):
         eset = self.get_obj()
@@ -1843,14 +1824,6 @@ class TestEntrySet(TestDebuggable):
         eset.reset_metadata(event)
         self.assertIsNone(eset.infoxml)
 
-        for fname in [':info', 'info']:
-            event = Mock()
-            event.filename = fname
-            eset.metadata = Mock()
-            eset.reset_metadata(event)
-            self.assertEqual(eset.metadata,
-                             mock_default_path_metadata.return_value)
-
     @patch("Bcfg2.Server.Plugin.helpers.bind_info")
     def test_bind_info_to_entry(self, mock_bind_info):
         # There's a strange scoping issue in py3k that prevents this
-- 
cgit v1.2.3-1-g7c22