Merge branch 'f-etag' into f-fsm

tests/test_query.py

@@ -1054,6 +1054,8 @@ def test_query_cache():
     response = query.execute()
     assert response == 1
     assert query.cached == False
+    assert query.etag is not None
+    etag = query.etag
 
     # cached == True
     query = h.Query("COUNT TestRT")
@@ -1061,6 +1063,7 @@ def test_query_cache():
     response = query.execute()
     assert response == 1
     assert query.cached == True
+    assert query.etag == etag
 
     # cached == True
     query = h.Query("FIND TestRT")
@@ -1068,6 +1071,7 @@ def test_query_cache():
     response = query.execute(unique=True)
     assert response.id == entity.id
     assert query.cached == True
+    assert query.etag == etag
 
     # cached == True
     query = h.Query("SELECT bla FROM TestRT")
@@ -1075,6 +1079,7 @@ def test_query_cache():
     response = query.execute(unique=True)
     assert response.id == entity.id
     assert query.cached == True
+    assert query.etag == etag
 
     # no cache flag
     query = h.Query("SELECT bla FROM TestRT")
@@ -1082,6 +1087,7 @@ def test_query_cache():
     response = query.execute(unique=True, cache=False)
     assert response.id == entity.id
     assert query.cached == False
+    assert query.etag == etag
 
     # cached == True
     query = h.Query("SELECT bla FROM TestRT")
@@ -1089,6 +1095,7 @@ def test_query_cache():
     response = query.execute(unique=True)
     assert response.id == entity.id
     assert query.cached == True
+    assert query.etag == etag
 
     # write resets cache
     another_entity = h.Record().add_parent("TestRT").insert()
@@ -1099,6 +1106,8 @@ def test_query_cache():
     response = query.execute()
     assert response == 2
     assert query.cached == False
+    assert query.etag != etag
+    new_etag = query.etag
 
     # cached == True
     query = h.Query("COUNT TestRT")
@@ -1106,6 +1115,7 @@ def test_query_cache():
     response = query.execute()
     assert response == 2
     assert query.cached == True
+    assert query.etag == new_etag
 
 
 def test_query_cache_with_permissions():