will_delete factored back in to AptBtrfsSnapshot.delete()

It is a messy solution, but it works and I can't be bothered to
change it yet.

Author: jpeg729

TODO

@@ -1,5 +1,5 @@
 Roadmap in order of planned implementation
 
- question: what happens if mounting fails
+ refactor will_delete back into apt_btrfs_snapshot delete()
 
  put on launchpad and publicise

apt_btrfs_snapshot.py

@@ -362,7 +362,32 @@ def delete(self, snapshot):
                 snapshot.name.startswith(SNAP_PREFIX)):
 
             # correct parent links and combine change info
-            snapshot.will_delete()
+            parent = snapshot.parent
+            children = snapshot.children
+            old_history = snapshot.changes
+            
+            # clean-ups in the global vars of 
+            snapshots.list_of.remove(snapshot)
+            if parent != None and parent.name in snapshots.children:
+                snapshots.children[parent.name].remove(snapshot)
+            
+            for child in children:
+                child.parent = parent
+                
+                # and do the same again in the global vars of snapshots
+                # messy but necessary for delete_older_than to work
+                snapshots.parents[child.name] = parent
+                if parent != None:
+                    snapshots.children[parent.name].append(child) # necessary
+                
+                newer_history = child.changes
+                if old_history == None:
+                    combined = newer_history
+                elif newer_history == None:
+                    combined = None
+                else:
+                    combined = old_history + newer_history
+                child.changes = combined
 
             res = self.commands.btrfs_delete_snapshot(to_delete)
         else:

snapshots.py

@@ -182,6 +182,7 @@ def _set_parent(self, parent):
         """ sets symlink from child to parent 
             or deletes it if parent == None 
         """
+        old_parent = self.parent
         parent_file = os.path.join(mp, self.name, PARENT_LINK)
         # remove parent link from self
         if os.path.lexists(parent_file):

test/test_snapshots.py

@@ -66,14 +66,17 @@ def test_parse_orphans(self):
         self.assertEqual(len(snapshots.orphans), 3)
 
     def test_set_parent(self):
-        child = SNAP_PREFIX + "2013-07-31_12:53:16-raring-to-go"
-        Snapshot(child).parent = None
+        child = Snapshot(SNAP_PREFIX + "2013-07-31_12:53:16-raring-to-go")
+        old_parent = child.parent
+        child.parent = None
         parent_file = os.path.join(self.sandbox, 
             SNAP_PREFIX + "2013-07-31_12:53:16-raring-to-go", PARENT_LINK)
         self.assertFalse(os.path.exists(parent_file))
-        Snapshot(child).parent = SNAP_PREFIX + "2013-07-26_14:50:53"
+        
+        new_parent = SNAP_PREFIX + "2013-07-26_14:50:53"
+        child.parent = new_parent
         self.assertEqual(os.readlink(parent_file), 
-            os.path.join(PARENT_DOTS, SNAP_PREFIX + "2013-07-26_14:50:53"))
+            os.path.join(PARENT_DOTS, new_parent))
 
     def test_list_snapshots(self):
         res = [s.name for s in snapshots.get_list()]
@@ -124,22 +127,6 @@ def test_tag(self):
         self.assertEqual(tagged.tag, "raring-to-go")
         self.assertEqual(not_tagged.tag, "")
 
-    def test_will_delete(self):
-        list_of = snapshots.list_of
-        random.shuffle(list_of)
-        for snap in list_of:
-            parent = snap.parent
-            children = snap.children
-            snap.will_delete()
-            self.assertNotIn(snap, snapshots.list_of)
-            self.assertNotIn(snap.name, snapshots.parents)
-            self.assertNotIn(snap.name, snapshots.children)
-            for child in children:
-                self.assertEqual(child.parent, parent)
-                if parent != None:
-                    self.assertIn(child, parent.children)
-            snapshots.setup(self.sandbox)
-
 
 if __name__ == "__main__":
     unittest.main()