don't add any add-ons by default for es tests

apps/addons/tests/test_models.py

@@ -1535,14 +1535,6 @@ class TestAddonWatchDisabled(amo.tests.TestCase):
 class TestSearchSignals(amo.tests.ESTestCase):
     es = True
 
-    @classmethod
-    def add_addons(cls):
-        pass
-
-    @classmethod
-    def reindex(cls):
-        pass
-
     def setUp(self):
         super(TestSearchSignals, self).setUp()
         addons.search.setup_mapping()
@@ -1614,7 +1606,7 @@ class TestLanguagePack(TestLanguagePack):
         eq_(self.addon.get_localepicker(), '')
 
 
-class TestMarketplace(amo.tests.ESTestCase):
+class TestMarketplace(amo.tests.TestCase):
 
     def setUp(self):
         self.addon = Addon.objects.create(type=amo.ADDON_EXTENSION)

apps/amo/tests/__init__.py

@@ -294,6 +294,9 @@ class ESTestCase(TestCase):
 
         super(ESTestCase, cls).setUpClass()
         addons.search.setup_mapping()
+
+    @classmethod
+    def setUpIndex(cls):
         cls.add_addons()
         cls.refresh()
 

apps/amo/tests/test_search.py

@@ -11,6 +11,11 @@ from addons.models import Addon
 class TestESIndexing(amo.tests.ESTestCase):
     es = True
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestESIndexing, cls).setUpClass()
+        cls.setUpIndex()
+
     # This needs to be in its own class for data isolation.
     def test_indexed_count(self):
         # Did all the right addons get indexed?
@@ -22,6 +27,11 @@ class TestESIndexing(amo.tests.ESTestCase):
 class TestES(amo.tests.ESTestCase):
     es = True
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestES, cls).setUpClass()
+        cls.setUpIndex()
+
     def test_clone(self):
         # Doing a filter creates a new ES object.
         qs = Addon.search()
@@ -335,6 +345,11 @@ class TestES(amo.tests.ESTestCase):
 class TestPaginator(amo.tests.ESTestCase):
     es = True
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestPaginator, cls).setUpClass()
+        cls.setUpIndex()
+
     def setUp(self):
         self.request = request = mock.Mock()
         request.GET.get.return_value = 1

apps/browse/tests.py

@@ -35,6 +35,11 @@ from versions.models import Version
 class ExtensionTestCase(amo.tests.ESTestCase):
     es = True
 
+    @classmethod
+    def setUpClass(cls):
+        super(ExtensionTestCase, cls).setUpClass()
+        setUpIndex()
+
     def setUp(self):
         super(ExtensionTestCase, self).setUp()
         self.url = reverse('browse.es.extensions')

apps/stats/tests/test_cron.py

@@ -105,10 +105,6 @@ class TestIndexStats(amo.tests.TestCase):
 class TestIndexLatest(amo.tests.ESTestCase):
     es = True
 
-    @classmethod
-    def add_addons(self):
-        pass
-
     def test_index_latest(self):
         latest = date.today() - timedelta(days=5)
         UpdateCount.index({'date': latest})

apps/stats/tests/test_views.py

@@ -300,11 +300,6 @@ class TestJSON(StatsTest, amo.tests.ESTestCase):
         super(TestJSON, self).setUp()
         self.index()
 
-    @classmethod
-    def add_addons(cls):
-        # Override the default that adds some add-ons.
-        pass
-
     def index(self):
         updates = UpdateCount.objects.values_list('id', flat=True)
         tasks.index_update_counts(list(updates))