From 41bc007d49e8bb304cdfb07231d402fa9ad828d7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 7 Feb 2017 17:06:47 +0100 Subject: [PATCH] torture/drs: remove pointless nc_object_count replication checks in test_link_utdv_hwm() nc_object_count and nc_linked_attributes_count are only filled if DRSUAPI_DRS_GET_NC_SIZE is requested. And they should contain the total number. This is only useful for the initial replication. Samba ignores DRSUAPI_DRS_GET_NC_SIZE currently but that will change in the following commits. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12398 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- selftest/knownfail | 2 ++ source4/torture/drs/python/getnc_exop.py | 27 ++++++++---------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/selftest/knownfail b/selftest/knownfail index d96e238796c..b453b9c820b 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -312,3 +312,5 @@ ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_add_duplicate_different_type.* ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_rank_none.* ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_security_descriptor.* +# nc_object_count is updated without GET_NC_SIZE +^samba4.drs.getnc_exop.python.*getnc_exop.DrsReplicaSyncTestCase.test_link_utdv_hwm.* diff --git a/source4/torture/drs/python/getnc_exop.py b/source4/torture/drs/python/getnc_exop.py index d9e06f20208..70fabfb4e29 100644 --- a/source4/torture/drs/python/getnc_exop.py +++ b/source4/torture/drs/python/getnc_exop.py @@ -171,8 +171,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): (hwm0, utdv0) = self._check_replication([ou2,dc3,cn3,ou1], drsuapi.DRSUAPI_DRS_WRIT_REP, - expected_links=[ou1_managedBy_dc3], - nc_object_count=4) + expected_links=[ou1_managedBy_dc3]) m = ldb.Message() m.dn = ldb.Dn(self.ldb_dc1, dc3) @@ -185,54 +184,46 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): self._check_replication([], drsuapi.DRSUAPI_DRS_WRIT_REP, expected_links=[dc3_managedBy_ou2], - highwatermark=hwm0, - nc_object_count=1) + highwatermark=hwm0) self._check_replication([], drsuapi.DRSUAPI_DRS_WRIT_REP| drsuapi.DRSUAPI_DRS_GET_ANC, expected_links=[dc3_managedBy_ou2], - highwatermark=hwm0, - nc_object_count=1) + highwatermark=hwm0) self._check_replication([], drsuapi.DRSUAPI_DRS_CRITICAL_ONLY, expected_links=[dc3_managedBy_ou2], - highwatermark=hwm0, - nc_object_count=1) + highwatermark=hwm0) self._check_replication([], drsuapi.DRSUAPI_DRS_CRITICAL_ONLY| drsuapi.DRSUAPI_DRS_GET_ANC, expected_links=[dc3_managedBy_ou2], - highwatermark=hwm0, - nc_object_count=1) + highwatermark=hwm0) self._check_replication([], drsuapi.DRSUAPI_DRS_WRIT_REP, expected_links=[dc3_managedBy_ou2], - uptodateness_vector=utdv0, - nc_object_count=4) + uptodateness_vector=utdv0) self._check_replication([], drsuapi.DRSUAPI_DRS_WRIT_REP| drsuapi.DRSUAPI_DRS_GET_ANC, expected_links=[dc3_managedBy_ou2], - uptodateness_vector=utdv0, - nc_object_count=4) + uptodateness_vector=utdv0) self._check_replication([], drsuapi.DRSUAPI_DRS_CRITICAL_ONLY, expected_links=[dc3_managedBy_ou2], - uptodateness_vector=utdv0, - nc_object_count=1) + uptodateness_vector=utdv0) self._check_replication([], drsuapi.DRSUAPI_DRS_CRITICAL_ONLY| drsuapi.DRSUAPI_DRS_GET_ANC, expected_links=[dc3_managedBy_ou2], - uptodateness_vector=utdv0, - nc_object_count=1) + uptodateness_vector=utdv0) def test_FSMONotOwner(self): """Test role transfer with against DC not owner of the role"""