@@ -60,6 +60,21 @@ class TestLDAPConfig : public testing::Test
60
60
fs.close ();
61
61
}
62
62
63
+ void eventLoop (uint8_t numberOfTimes)
64
+ {
65
+ if (numberOfTimes == 0 || numberOfTimes > 15 )
66
+ {
67
+ return ;
68
+ }
69
+
70
+ for (int i = 0 ; i < numberOfTimes; i++)
71
+ {
72
+ bus.process_discard ();
73
+ // wait for 1 seconds
74
+ bus.wait (1 * 1000000 );
75
+ }
76
+ }
77
+
63
78
void TearDown () override
64
79
{
65
80
fs::remove_all (dir);
@@ -461,7 +476,8 @@ TEST_F(TestLDAPConfig, testSearchScope)
461
476
" MyLdap12" , ldap_base::Create::SearchScope::sub,
462
477
ldap_base::Create::Type::ActiveDirectory, " attr1" , " attr2" );
463
478
managerPtr->getADConfigPtr ()->enabled (true );
464
-
479
+ // Process D-Bus calls
480
+ eventLoop (6 );
465
481
// Change LDAP SearchScope
466
482
managerPtr->getADConfigPtr ()->ldapSearchScope (
467
483
ldap_base::Config::SearchScope::one);
@@ -618,7 +634,8 @@ TEST_F(TestLDAPConfig, ConditionalEnableConfig)
618
634
619
635
EXPECT_EQ (managerPtr->getADConfigPtr ()->enabled (), true );
620
636
EXPECT_EQ (managerPtr->getOpenLdapConfigPtr ()->enabled (), false );
621
-
637
+ // Process D-Bus calls
638
+ eventLoop (5 );
622
639
// AS AD is already enabled so openldap can't be enabled.
623
640
EXPECT_THROW (
624
641
{
@@ -641,6 +658,8 @@ TEST_F(TestLDAPConfig, ConditionalEnableConfig)
641
658
EXPECT_EQ (managerPtr->getOpenLdapConfigPtr ()->enabled (), false );
642
659
// Now enable the openldap
643
660
managerPtr->getOpenLdapConfigPtr ()->enabled (true );
661
+ // Process D-Bus calls
662
+ eventLoop (5 );
644
663
EXPECT_EQ (managerPtr->getOpenLdapConfigPtr ()->enabled (), true );
645
664
EXPECT_EQ (managerPtr->getADConfigPtr ()->enabled (), false );
646
665
@@ -678,6 +697,8 @@ TEST_F(TestLDAPConfig, createPrivMapping)
678
697
}
679
698
},
680
699
PrivilegeMappingExists);
700
+ // Process D-Bus calls
701
+ eventLoop (2 );
681
702
}
682
703
683
704
TEST_F (TestLDAPConfig, deletePrivMapping)
@@ -719,6 +740,8 @@ TEST_F(TestLDAPConfig, deletePrivMapping)
719
740
EXPECT_NO_THROW (manager.getADConfigPtr ()->checkPrivilegeMapper (" admin" ));
720
741
manager.getADConfigPtr ()->deletePrivilegeMapper (2 );
721
742
EXPECT_NO_THROW (manager.getADConfigPtr ()->checkPrivilegeMapper (" user" ));
743
+ // Process D-Bus calls
744
+ eventLoop (2 );
722
745
}
723
746
724
747
TEST_F (TestLDAPConfig, restorePrivMapping)
@@ -798,6 +821,8 @@ TEST_F(TestLDAPConfig, testPrivileges)
798
821
799
822
EXPECT_NO_THROW (entry->privilege (" priv-operator" ));
800
823
EXPECT_NO_THROW (entry->privilege (" priv-user" ));
824
+ // Process D-Bus calls
825
+ eventLoop (5 );
801
826
}
802
827
803
828
} // namespace ldap
0 commit comments