Make full path of the object seen in the output for any change in Set…

…Action and EditAction

Change-Id: I9c3a90f2fbf754876ca0ce083747549c22bd7b5b

conftool/action.py

@@ -86,7 +86,7 @@ def run(self):
                     print("Reported reason: {}".format(e))
                     self._check_amend(e)
             self.entity.update(self.edited)
-            return "Entity successfully updated"
+            return "Entity {} successfully updated".format(self.entity.pprint())
         finally:
             os.unlink(self.temp)
 
@@ -108,6 +108,7 @@ def _to_file(self):
             self.temp = f.name
         else:
             f = open(self.temp, 'wb')
+            f.write("# Editing object {}".format(self.entity.pprint()))
         self.entity.fetch()
         yaml.safe_dump(self.entity._to_net(), stream=f, encoding='utf-8')
         f.close()
@@ -184,7 +185,7 @@ def run(self):
             curval = getattr(self.entity, k)
             if v != curval:
                 msg = "%s: %s changed %s => %s" % (
-                    self.entity.name, k,
+                    self.entity.pprint(), k,
                     curval, v)
                 desc.append(msg)
         self.entity.update(self.args)

conftool/kvobject.py

@@ -247,6 +247,10 @@ def key(self):
     def tags(self):
         return self._current_tags
 
+    def pprint(self):
+        tags_path = os.path.join(*[self._current_tags[tag] for tag in self._tags])
+        return os.path.join(tags_path, self._name)
+
     @classmethod
     def dir(cls, *tags):
         if len(tags) != len(cls._tags):

conftool/tests/unit/test_action.py

@@ -128,7 +128,7 @@ def test_edit_run(self):
         a.temp = 'testunlink'
         with mock.patch('conftool.action.os.unlink') as unlinker:
             self.entity.update = mock.MagicMock()
-            self.assertEqual(a.run(), "Entity successfully updated")
+            self.assertEqual(a.run(), "Entity Foo/Bar/test successfully updated")
             self.entity.update.assert_called_with(a.edited)
             a._edit.assert_called_once()
         exception = ValueError('test me')
@@ -137,7 +137,7 @@ def test_edit_run(self):
         )
         a._check_amend = mock.MagicMock()
         with mock.patch('conftool.action.os.unlink') as unlinker:
-            self.assertEqual(a.run(), "Entity successfully updated")
+            self.assertEqual(a.run(), "Entity Foo/Bar/test successfully updated")
             a._check_amend.assert_called_with(exception)
             unlinker.assert_called_with(a.temp)
 

conftool/tests/unit/test_kvobject.py

@@ -23,6 +23,8 @@ def test_tags(self):
         ent = MockBasicEntity()
         self.assertEqual(ent.tags, {'A': 'a', 'B': 'b', 'C': 'c', 'D': 'd'})
 
+    def test_pprint(self):
+        self.assertEqual(self.entity.pprint(), 'Foo/Bar/test')
 
     def test_kvpath(self):
         """