Deleted field for session model

core/db/models.py

@@ -91,6 +91,7 @@ class Session(Base, FeaturesMixin):
     run_script = Column(String)
     created = Column(DateTime, default=datetime.now)
     modified = Column(DateTime, default=datetime.now)
+    deleted = Column(DateTime)
 
     # State
     status = Column(Enum('unknown', 'running', 'succeed', 'failed', 'waiting',

core/sessions.py

@@ -115,6 +115,10 @@ def delete(self, message=""):
         if self.vnc_recorder:
             self.vnc_recorder.stop()
 
+        self.closed = True
+        self.deleted = datetime.now()
+        self.save()
+
         current_app.sessions.remove(self)
         if hasattr(self, "endpoint"):
             log.info("Deleting VM for session: %s" % self.id)
@@ -125,15 +129,11 @@ def delete(self, message=""):
 
     def succeed(self):
         self.status = "succeed"
-        self.closed = True
-        self.save()
         self.delete()
 
     def failed(self, tb="Session closed by user"):
         self.status = "failed"
-        self.closed = True
         self.error = tb
-        self.save()
         self.delete(tb)
 
     def set_vm(self, endpoint):

migrations/alembic/versions/1de18183a7da_deleted_field_for_session.py

@@ -0,0 +1,23 @@
+"""deleted_field_for_session
+
+Revision ID: 1de18183a7da
+Revises: 3d52588e4d9c
+Create Date: 2015-10-07 18:20:57.252212
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '1de18183a7da'
+down_revision = '3d52588e4d9c'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('sessions', sa.Column('deleted', sa.DateTime(),
+                                        nullable=True))
+
+
+def downgrade():
+    op.drop_column('sessions', 'deleted')

migrations/migrations.py

@@ -15,7 +15,7 @@
 
 
 def run(connection_string):
-    revision = "3d52588e4d9c"
+    revision = "1de18183a7da"
 
     alembic_cfg.set_main_option("sqlalchemy.url", connection_string)
     try:

tests/unit/test_commands.py

@@ -86,6 +86,8 @@ def setUp(self):
     def tearDown(self):
         with patch(
             'flask.current_app.sessions', Mock()
+        ), patch(
+            'flask.current_app.database', Mock()
         ), patch(
             'vmpool.endpoint.delete_vm', Mock()
         ):