Merge branch 'master' of github.com:cfpb/regulations-core

mergin master to local

buildout.cfg

@@ -14,7 +14,6 @@ eggs = ${buildout:eggs}
 [django]
 recipe = djangorecipe
 project = regcore
-projectegg = regcore
 settings = example_settings
 test = regcore regcore_read regcore_write
 eggs = ${buildout:eggs}

regcore/tests/db_splitter_tests.py

@@ -11,7 +11,8 @@
 
 
 class SplitterRegulationsTest(TestCase, dm.ReusableDMRegulations):
-    def setUp(self):
+    @patch('regcore.db.es.ElasticSearch')
+    def setUp(self, es):
         Regulation.objects.all().delete()
         self.dmr = SplitterRegulations()
 
@@ -81,7 +82,8 @@ def test_bulk_put_overwrite(self, es):
 
 
 class SplitterLayersTest(TestCase, dm.ReusableDMLayers):
-    def setUp(self):
+    @patch('regcore.db.es.ElasticSearch')
+    def setUp(self, es):
         Layer.objects.all().delete()
         self.dml = SplitterLayers()
 
@@ -138,7 +140,8 @@ def test_bulk_put_overwrite(self, es):
 
 
 class SplitterNoticesTest(TestCase, dm.ReusableDMNotices):
-    def setUp(self):
+    @patch('regcore.db.es.ElasticSearch')
+    def setUp(self, es):
         Notice.objects.all().delete()
         self.dmn = SplitterNotices()
 
@@ -194,7 +197,8 @@ def test_put_overwrite(self, es):
 
 
 class SplitterDiffTest(TestCase, dm.ReusableDMDiff):
-    def setUp(self):
+    @patch('regcore.db.es.ElasticSearch')
+    def setUp(self, es):
         Diff.objects.all().delete()
         self.dmd = SplitterDiffs()