Improve some tests, Remove extra line of code

Author: mjnaderi

qsessions/backends/common.py

@@ -10,7 +10,6 @@ class QSessionStoreMixin(object):
     - User Agent
     """
     def __init__(self, session_key=None, user_agent=None, ip=None):
-        self.modified = False
         self.user_agent = user_agent[:300] if user_agent else user_agent
         self.ip = ip
         super(QSessionStoreMixin, self).__init__(session_key)

tests/test_clearsessions.py

@@ -9,9 +9,15 @@
 @pytest.mark.django_db
 def test_can_call():
     Session.objects.create(
-        expire_date=datetime.now() - timedelta(days=1),
+        session_key='s1',
+        expire_date=datetime.now() + timedelta(hours=1),
         ip='127.0.0.1',
     )
-    assert Session.objects.count() == 1
+    Session.objects.create(
+        session_key='s2',
+        expire_date=datetime.now() - timedelta(hours=1),
+        ip='127.0.0.1',
+    )
+    assert Session.objects.count() == 2
     call_command('clearsessions')
-    assert Session.objects.count() == 0
+    assert Session.objects.count() == 1

tests/test_sessionstore.py

@@ -6,6 +6,7 @@
 from django.contrib.sessions.backends.base import CreateError
 from django.utils.timezone import now
 
+from qsessions import IP_SESSION_KEY, USER_AGENT_SESSION_KEY
 from qsessions.models import Session
 
 SessionStore = Session.get_session_store_class()
@@ -19,6 +20,17 @@ def setup_store():
 def test_untouched_init(store):
     assert store.modified is False
     assert store.accessed is False
+    assert store.get('cat') is None
+
+
+def test_store(store):
+    store['cat'] = 'dog'
+    assert store.accessed is True
+    assert store.modified is True
+    assert 'cat' in store
+    assert store.pop('cat') == 'dog'
+    assert 'cat' not in store
+    assert store.get('cat') is None
 
 
 def test_auth_session_key(store):
@@ -56,8 +68,8 @@ def test_load_unmodified(store, django_user_model):
     store2 = SessionStore(session_key=store.session_key,
                           user_agent='TestUA/1.1', ip='127.0.0.1')
     store2.load()
-    assert store2.user_agent == 'TestUA/1.1'
-    assert store2.ip == '127.0.0.1'
+    assert store2.get(USER_AGENT_SESSION_KEY) == 'TestUA/1.1'
+    assert store2.get(IP_SESSION_KEY) == '127.0.0.1'
     assert store2.get(auth.SESSION_KEY) == 1
     assert store2.modified is False
 
@@ -69,13 +81,18 @@ def test_load_modified(store, django_user_model):
     store[auth.SESSION_KEY] = 1
     store.save()
     store2 = SessionStore(session_key=store.session_key,
-                          user_agent='TestUA/1.1', ip='8.8.8.8')
+                          user_agent='TestUA/1.1-changed', ip='8.8.8.8')
     store2.load()
-    assert store2.user_agent == 'TestUA/1.1'
-    assert store2.ip == '8.8.8.8'
+    assert store2.get(USER_AGENT_SESSION_KEY) == 'TestUA/1.1'
+    assert store2.get(IP_SESSION_KEY) == '127.0.0.1'
     assert store2.get(auth.SESSION_KEY) == 1
     assert store2.modified is True
 
+    store2.save()
+
+    assert store2.get(USER_AGENT_SESSION_KEY) == 'TestUA/1.1-changed'
+    assert store2.get(IP_SESSION_KEY) == '8.8.8.8'
+
 
 @pytest.mark.django_db
 def test_duplicate_create():