diff options
author | Michael Adam <obnox@samba.org> | 2015-03-16 18:45:52 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2015-03-17 16:48:07 +0100 |
commit | 9139caa57a4247ecaa71d6f86db2f79ec20f8140 (patch) | |
tree | 4c16b4e518c4426760f81b377a5ea092bca8d37d | |
parent | 06a410dfb137bf9fc775ba8ffb3e42a506b495a9 (diff) | |
download | samba-9139caa57a4247ecaa71d6f86db2f79ec20f8140.tar.gz |
dsdb: fix error message in tombstone_reanimation test.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r-- | source4/dsdb/tests/python/tombstone_reanimation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py index 640727931e0..ad780fd562c 100644 --- a/source4/dsdb/tests/python/tombstone_reanimation.py +++ b/source4/dsdb/tests/python/tombstone_reanimation.py @@ -83,7 +83,7 @@ class RestoredObjectAttributesBaseTestCase(samba.tests.TestCase): return self.search_dn(msg['dn']) def assertAttributesEqual(self, obj_orig, attrs_orig, obj_restored, attrs_rest): - self.assertEqual(attrs_orig, attrs_rest, "Actual object does not has expected attributes") + self.assertEqual(attrs_orig, attrs_rest, "Actual object does not have expected attributes") # remove volatile attributes, they can't be equal attrs_orig -= set(["uSNChanged", "dSCorePropagationData", "whenChanged"]) for attr in attrs_orig: @@ -115,7 +115,7 @@ class RestoredObjectAttributesBaseTestCase(samba.tests.TestCase): actual_names = set(obj_msg.keys()) # Samba does not use 'dSCorePropagationData', so skip it actual_names -= set(['dSCorePropagationData']) - self.assertEqual(set(attr_expected.keys()), actual_names, "Actual object does not has expected attributes") + self.assertEqual(set(attr_expected.keys()), actual_names, "Actual object does not have expected attributes") for name in attr_expected.keys(): expected_val = attr_expected[name] actual_val = obj_msg.get(name) @@ -359,7 +359,7 @@ class RestoreUserObjectTestCase(RestoredObjectAttributesBaseTestCase): # windows restore more attributes that originally we have orig_attrs.update(['adminCount', 'operatorCount', 'lastKnownParent']) rest_attrs = set(obj_restore.keys()) - self.assertEqual(orig_attrs, rest_attrs, "Actual object does not has expected attributes") + self.assertEqual(orig_attrs, rest_attrs, "Actual object does not have expected attributes") self.assertAttributesExists(self._expected_user_attributes(username, usr_dn, "Person"), obj_restore) |