Update tournament tests now that basic_strategies is a subset of ordinary_strategies

Author: marcharper

axelrod/tests/integration/test_tournament.py

@@ -27,7 +27,7 @@ def setUpClass(cls):
 
     def test_full_tournament(self):
         """A test to check that tournament runs with all non cheating strategies."""
-        strategies = [strategy() for strategy in axelrod.basic_strategies + axelrod.ordinary_strategies]
+        strategies = [strategy() for strategy in axelrod.ordinary_strategies]
         tournament = axelrod.Tournament(name='test', players=strategies, game=self.game, turns=500, repetitions=2)
         output_of_tournament = tournament.play().results
         self.assertEqual(type(output_of_tournament), dict)

axelrod/tests/unit/test_tournament_manager_factory.py

@@ -22,11 +22,9 @@ def setUpClass(cls):
 
         cls.expected_basic_strategies = axelrod.basic_strategies
         cls.expected_strategies = (
-            axelrod.basic_strategies +
             axelrod.ordinary_strategies)
         cls.expected_cheating_strategies = axelrod.cheating_strategies
         cls.expected_all_strategies = (
-            axelrod.basic_strategies +
             axelrod.ordinary_strategies +
             axelrod.cheating_strategies)
 

axelrod/tournament_manager_factory.py

@@ -53,11 +53,9 @@ def _tournaments_dict(exclusions=None):
         tournaments = OrderedDict([
             ('basic_strategies', axelrod.basic_strategies),
             ('strategies',
-                axelrod.basic_strategies +
                 axelrod.ordinary_strategies),
             ('cheating_strategies', axelrod.cheating_strategies),
             ('all_strategies',
-                axelrod.basic_strategies +
                 axelrod.ordinary_strategies +
                 axelrod.cheating_strategies)
         ])