Fix tests failing in master (#4759)

* clean ESes

* compare set to set

* print data on travis

* Cuyahoga Falls -> Tallmadge

* remove weird casts

app/marketing/tests/management/commands/test_assemble_leaderboards.py

@@ -157,21 +157,21 @@ def test_bounty_index_terms(self):
         index_terms = bounty_index_terms(self.bounty)
         assert len(index_terms) == 15
         assert 'USDT' in index_terms
-        assert set([self.bounty_payer_handle, self.bounty_earner_handle, 'gitcoinco']).issubset(set(index_terms))
-        assert set(['Cuyahoga Falls', 'United States', 'North America']).issubset(set(index_terms))
-        assert set(['London', 'United Kingdom', 'Europe']).issubset(set(index_terms))
-        assert set(['Australia', 'Oceania']).issubset(set(index_terms))
-        assert set(['python', 'shell']).issubset(set(index_terms))
+        assert {self.bounty_payer_handle, self.bounty_earner_handle, 'gitcoinco'}.issubset(set(index_terms))
+        assert {'Tallmadge', 'United States', 'North America'}.issubset(set(index_terms))
+        assert {'London', 'United Kingdom', 'Europe'}.issubset(set(index_terms))
+        assert {'Australia', 'Oceania'}.issubset(set(index_terms))
+        assert {'python', 'shell'}.issubset(set(index_terms))
 
     def test_tip_index_terms(self):
         """Test tip index terms list."""
         index_terms = tip_index_terms(self.tip)
 
         assert len(index_terms) == 10
         assert 'USDT' in index_terms
-        assert set([self.tip_payer_handle, self.tip_earner_handle, 'gitcoinco']).issubset(set(index_terms))
-        assert set(['Cuyahoga Falls', 'United States', 'North America']).issubset(set(index_terms))
-        assert set(['London', 'United Kingdom', 'Europe']).issubset(set(index_terms))
+        assert {self.tip_payer_handle, self.tip_earner_handle, 'gitcoinco'}.issubset(set(index_terms))
+        assert {'Tallmadge', 'United States', 'North America'}.issubset(set(index_terms))
+        assert {'London', 'United Kingdom', 'Europe'}.issubset(set(index_terms))
 
     def test_sum_bounties_payer(self):
         """Test sum bounties leaderboards."""

app/marketing/tests/test_marketing_utils.py

@@ -50,6 +50,8 @@ class MarketingEmailUtilsTest(TestCase):
 
     def setUp(self):
         """Perform setup for the testcase."""
+        test_es = EmailSubscriber.objects.all().delete()
+
         EmailSubscriber.objects.create(
             email='[email protected]',
             source='mysource',