- Document new setting

 - Fix loaddata test to pass without disabling concurrency
 - Remove loaddata test that disable concurrency (now redundant)

Author: claytondaley

docs/settings.rst

@@ -92,6 +92,19 @@ Default: ``CONCURRENCY_LIST_EDITABLE_POLICY_SILENT``
 
 .. _list_editable_policies:
 
+.. setting:: CONCURRENCY_IGNORE_DEFAULT
+
+IGNORE_DEFAULT
+--------------
+.. versionadded:: >1.2
+
+Default: ``True``
+
+Determines whether a default version number is ignored or used in a concurrency check.  While this
+configuration defaults to True for backwards compatibility, this setting can cause omitted version
+numbers to pass concurrency checks. New implementations are recommended to set this to ``False``.
+
+
 ``CONCURRENCY_LIST_EDITABLE_POLICY_SILENT``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Used by admin's integrations to handle ``list_editable`` conflicts.

tests/test_loaddata_dumpdata.py

@@ -32,22 +32,6 @@ def test_loaddata_fail():
     data = json.load(open(datafile, 'r'))
     pk = data[0]['pk']
 
-    with pytest.raises(RecordModifiedError):
-        call_command('loaddata', datafile, stdout=StringIO())
-
-    assert not SimpleConcurrentModel.objects.filter(id=pk).exists()
-
-
-@pytest.mark.django_db(transaction=False)
-def test_loaddata():
-    datafile = os.path.join(os.path.dirname(__file__), 'dumpdata.json')
-    data = json.load(open(datafile, 'r'))
-    pk = data[0]['pk']
-
-    # with pytest.raises(RecordModifiedError):
-    #     call_command('loaddata', datafile, stdout=StringIO())
-
-    with disable_concurrency():
-        call_command('loaddata', datafile, stdout=StringIO())
+    call_command('loaddata', datafile, stdout=StringIO())
 
     assert SimpleConcurrentModel.objects.get(id=pk).username == 'loaded'