diff options
| author | Nagaraju Goruganti <ngorugan@in.ibm.com> | 2018-11-09 03:34:12 -0600 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-19 21:37:57 -0500 |
| commit | bc4f180c2f15cdca8489168fd796e92aeeb8f52b (patch) | |
| tree | e8143cb8dc81f42d07164703307600d73e2a4c7a | |
| parent | 5088e54473b49b40e5ceab2fae2999619f31b7d3 (diff) | |
| download | phosphor-user-manager-bc4f180c2f15cdca8489168fd796e92aeeb8f52b.tar.gz phosphor-user-manager-bc4f180c2f15cdca8489168fd796e92aeeb8f52b.zip | |
phosphor-ldap-conf: nslcd restart service getting called twice
In the createconfig path nslcd restart service is getting called twice
in a row, which not needed.
Change-Id: Ib60d43110815758360aa6f0de0478ad784cf5a5a
Signed-off-by: Nagaraju Goruganti <ngorugan@in.ibm.com>
| -rw-r--r-- | phosphor-ldap-config/ldap_configuration.cpp | 1 | ||||
| -rw-r--r-- | test/ldap_config_test.cpp | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/phosphor-ldap-config/ldap_configuration.cpp b/phosphor-ldap-config/ldap_configuration.cpp index 8503929..0ce4c61 100644 --- a/phosphor-ldap-config/ldap_configuration.cpp +++ b/phosphor-ldap-config/ldap_configuration.cpp @@ -39,7 +39,6 @@ Config::Config(sdbusplus::bus::bus& bus, const char* path, const char* filePath, ConfigIface::lDAPSearchScope(lDAPSearchScope); ConfigIface::lDAPType(lDAPType); writeConfig(); - parent.restartService(nslcdService); // Emit deferred signal. this->emit_object_added(); } diff --git a/test/ldap_config_test.cpp b/test/ldap_config_test.cpp index 0893a95..819a8cf 100644 --- a/test/ldap_config_test.cpp +++ b/test/ldap_config_test.cpp @@ -91,7 +91,7 @@ TEST_F(TestLDAPConfig, testCreate) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr manager(bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(manager, restartService("nslcd.service")).Times(2); + EXPECT_CALL(manager, restartService("nslcd.service")).Times(1); EXPECT_CALL(manager, restartService("nscd.service")).Times(1); manager.createConfig("ldap://9.194.251.136/", "cn=Users,dc=com", "cn=Users,dc=corp", "MyLdap12", @@ -120,7 +120,7 @@ TEST_F(TestLDAPConfig, testRestores) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr* managerPtr = new MockConfigMgr( bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(4); + EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(2); EXPECT_CALL(*managerPtr, restartService("nscd.service")).Times(2); managerPtr->createConfig("ldap://9.194.251.138/", "cn=Users,dc=com", "cn=Users,dc=corp", "MyLdap12", @@ -156,7 +156,7 @@ TEST_F(TestLDAPConfig, testLDAPServerURI) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr* managerPtr = new MockConfigMgr( bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(5); + EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(3); EXPECT_CALL(*managerPtr, restartService("nscd.service")).Times(2); managerPtr->createConfig("ldap://9.194.251.138/", "cn=Users,dc=com", @@ -195,7 +195,7 @@ TEST_F(TestLDAPConfig, testLDAPBindDN) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr* managerPtr = new MockConfigMgr( bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(5); + EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(3); EXPECT_CALL(*managerPtr, restartService("nscd.service")).Times(2); managerPtr->createConfig("ldap://9.194.251.138/", "cn=Users,dc=com", @@ -242,7 +242,7 @@ TEST_F(TestLDAPConfig, testLDAPBaseDN) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr* managerPtr = new MockConfigMgr( bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(5); + EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(3); EXPECT_CALL(*managerPtr, restartService("nscd.service")).Times(2); managerPtr->createConfig("ldap://9.194.251.138/", "cn=Users,dc=com", "cn=Users,dc=corp", "MyLdap12", @@ -288,7 +288,7 @@ TEST_F(TestLDAPConfig, testSearchScope) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr* managerPtr = new MockConfigMgr( bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(5); + EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(3); EXPECT_CALL(*managerPtr, restartService("nscd.service")).Times(2); managerPtr->createConfig("ldap://9.194.251.138/", "cn=Users,dc=com", "cn=Users,dc=corp", "MyLdap12", @@ -321,7 +321,7 @@ TEST_F(TestLDAPConfig, testLDAPType) EXPECT_FALSE(fs::exists(configFilePath)); MockConfigMgr* managerPtr = new MockConfigMgr( bus, LDAP_CONFIG_ROOT, configFilePath.c_str(), tlsCacertfile.c_str()); - EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(5); + EXPECT_CALL(*managerPtr, restartService("nslcd.service")).Times(3); EXPECT_CALL(*managerPtr, restartService("nscd.service")).Times(2); managerPtr->createConfig("ldap://9.194.251.138/", "cn=Users,dc=com", "cn=Users,dc=corp", "MyLdap12", |
