fixup! Fixes #19556: Modify the internal rules and directives at inst…

…all time to support the new system techniques Fixes #19556: Modify the internal rules and directives at install time to support the new system techniques
Normation · Jul 25, 2021 · 5d2ad85 · 5d2ad85
1 parent 2f694ac
commit 5d2ad85
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/webapp/sources/rudder/rudder-core/src/main/resources/ldap/init-policy-server.ldif b/webapp/sources/rudder/rudder-core/src/main/resources/ldap/init-policy-server.ldif
@@ -203,18 +203,6 @@ isEnabled: TRUE
 isSystem: TRUE
 serializedTags: []
 
-#
-#dn: directiveId=root-distributePolicy,activeTechniqueId=distributePolicy,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration
-#objectClass: directive
-#objectClass: top
-#directiveId: root-distributePolicy
-#cn: Distribute Policy
-#description: Distribute policy - Technical
-#techniqueVersion: 0:1.0
-#isEnabled: TRUE
-#isSystem: TRUE
-#directivePriority: 0
-
 # common (has policy server)
 
 dn: directiveId=common-root,activeTechniqueId=common,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration

diff --git a/...rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala b/...rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala
@@ -150,7 +150,7 @@ class TestQueryProcessor extends Loggable {
       res.size
     }).runNow
 
-    val expected = 41+38  //bootstrap + inventory-sample
+    val expected = 43+38  //bootstrap + inventory-sample
     assert(expected == s, s"Not found the expected number of entries in test LDAP directory [expected: ${expected}, found: ${s}], perhaps the demo entries where not correctly loaded")
   }