Revision d357f531 test/testutils.py

b/test/testutils.py
75 75
    actual_mode = stat.S_IMODE(st.st_mode)
76 76
    self.assertEqual(actual_mode, expected_mode)
77 77

  
78
  def assertEqualValues(self, first, second, msg=None):
79
    """Compares two values whether they're equal.
80

  
81
    Tuples are automatically converted to lists before comparing.
82

  
83
    """
84
    return self.assertEqual(UnifyValueType(first),
85
                            UnifyValueType(second),
86
                            msg=msg)
87

  
78 88
  @staticmethod
79 89
  def _TestDataFilename(name):
80 90
    """Returns the filename of a given test data file.
......
97 107
    proper test file name.
98 108

  
99 109
    """
100

  
101 110
    return utils.ReadFile(cls._TestDataFilename(name))
102 111

  
103 112
  def _CreateTempFile(self):
......
111 120
    os.close(fh)
112 121
    self._temp_files.append(fname)
113 122
    return fname
123

  
124

  
125
def UnifyValueType(data):
126
  """Converts all tuples into lists.
127

  
128
  This is useful for unittests where an external library doesn't keep types.
129

  
130
  """
131
  if isinstance(data, (tuple, list)):
132
    return [UnifyValueType(i) for i in data]
133

  
134
  elif isinstance(data, dict):
135
    return dict([(UnifyValueType(key), UnifyValueType(value))
136
                 for (key, value) in data.iteritems()])
137

  
138
  return data

Also available in: Unified diff