Fix memory depth bug revealed by test

Author: marcharper

axelrod/strategies/shortmem.py

@@ -22,7 +22,7 @@ class ShortMem(Player):
 
     name = "ShortMem"
     classifier = {
-        "memory_depth": 10,
+        "memory_depth": float('inf'),
         "stochastic": False,
         "makes_use_of": set(),
         "long_run_time": False,

axelrod/tests/strategies/test_meta.py

@@ -369,7 +369,7 @@ class TestMetaMajorityFiniteMemory(TestMetaPlayer):
     }
 
     def test_strategy(self):
-        actions = [(C, C), (C, D), (D, C), (C, D), (C, C)]
+        actions = [(C, C), (C, D), (D, C), (C, D), (D, C)]
         self.versus_test(opponent=axelrod.Alternator(), expected_actions=actions)
 
 

axelrod/tests/strategies/test_player.py

@@ -491,6 +491,7 @@ def test_memory_depth_upper_bound(self, strategies, seed, turns):
         memory = player.classifier["memory_depth"]
         if memory < float("inf"):
             for strategy in strategies:
+                player.reset()
                 opponent = strategy()
                 self.assertTrue(
                     test_memory(

axelrod/tests/strategies/test_shortmem.py

@@ -7,12 +7,12 @@
 C, D = axelrod.Action.C, axelrod.Action.D
 
 
-class TestCooperator(TestPlayer):
+class TestShortMem(TestPlayer):
 
     name = "ShortMem"
     player = axelrod.ShortMem
     expected_classifier = {
-        "memory_depth": 10,
+        "memory_depth": float('inf'),
         "stochastic": False,
         "makes_use_of": set(),
         "inspects_source": False,