Fix test for calculator + implemented player eq

This implements a player equality which is needed in this particular
case.

Author: drvinceknight

axelrod/player.py

@@ -1,7 +1,9 @@
 from collections import defaultdict
 from functools import wraps
+import types
 import random
 import copy
+import numpy as np
 
 from axelrod.actions import Actions, flip_action, Action
 from .game import DefaultGame
@@ -189,3 +191,21 @@ def reset(self):
         self.cooperations = 0
         self.defections = 0
         self.state_distribution = defaultdict(int)
+
+    def __eq__(self, other):
+        """
+        Test if two players are equal.
+        """
+        check = self.__repr__() == other.__repr__()
+        for attribute, value in self.__dict__.items():
+            other_value = getattr(other, attribute)
+
+            if isinstance(value, np.ndarray):
+                check = check and np.array_equal(value, other_value)
+
+            elif isinstance(value, types.GeneratorType):
+                check = check and all(next(value) == next(other_value)
+                                      for _ in range(10))
+            else:
+                check = check and value == other_value
+        return check

axelrod/tests/unit/test_match_generator.py

@@ -32,11 +32,11 @@ def test_init_with_clone(self):
         self.assertEqual(tt.turns, test_turns)
         player = tt.players[0]
         opponent = tt.opponents[0]
-        self.assertEqual(player.name, opponent.name)
-        self.assertNotEqual(player, opponent)
+        self.assertEqual(player, opponent)
+        self.assertIsNot(player, opponent)
         # Check that the two player instances are wholly independent
         opponent.name = 'Test'
-        self.assertNotEqual(player.name, opponent.name)
+        self.assertNotEqual(player, opponent)
 
     def test_len(self):
         tt = axelrod.MatchGenerator(