From e023a96ec76340ab27bfb1b621853a2f23e992cd Mon Sep 17 00:00:00 2001 From: Lukasz Kostyra Date: Tue, 24 Sep 2013 09:28:08 +0200 Subject: [PATCH] Adapt security-server tests to new SS password service [Issue#] N/A [Bug] N/A [Cause] Incorrect return values expected by asserts. [Solution] Correct return values expected by asserts. [Verification] Build, install, run security-server-tests-password. All tests should pass. Change-Id: I351655de0e4e3d76b737a38c226d933e878aafa5 --- .../security_server_tests_password.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/security-server-tests/security_server_tests_password.cpp b/tests/security-server-tests/security_server_tests_password.cpp index 7c59174..bb6f9b5 100644 --- a/tests/security-server-tests/security_server_tests_password.cpp +++ b/tests/security-server-tests/security_server_tests_password.cpp @@ -46,7 +46,7 @@ void reset_security_server(){ system("if [ -d /opt/data/security-server ]; then \n rm -rf /opt/data/security-server/*; \n fi"); sync(); restart_security_server(); - sleep(1); + sleep(2); } @@ -63,8 +63,7 @@ RUNNER_TEST(tc01_clear_environment) if (getuid() == 0) { - system("rm /opt/data/security-server/*"); - sync(); + reset_security_server(); ret = security_server_is_pwd_valid(&attempt, &max_attempt, &expire_sec); @@ -260,13 +259,13 @@ RUNNER_TEST(tc10_security_server_set_pwd_current_pwd_max_valid_period_in_days) // TEST sleep(1); // UINT_MAX will cause api error, it is to big value - ret = security_server_set_pwd(TEST_PASSWORD, TEST_PASSWORD, 0, UINT_MAX); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_BAD_REQUEST, "ret = " << ret); + ret = security_server_set_pwd(TEST_PASSWORD, SECOND_TEST_PASSWORD, 0, UINT_MAX); + RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_INPUT_PARAM, "ret = " << ret); sleep(1); // calculate max applicable valid days that will not be rejected by ss // ensure, that after conversion from days to seconds in ss there will be no uint overflow unsigned int valid_days = ((UINT_MAX - time(NULL)) / 86400) - 1; - ret = security_server_set_pwd(TEST_PASSWORD, TEST_PASSWORD, 0, valid_days); + ret = security_server_set_pwd(TEST_PASSWORD, SECOND_TEST_PASSWORD, 0, valid_days); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret = " << ret); } @@ -283,7 +282,7 @@ RUNNER_TEST(tc11_security_server_set_pwd_current_pwd_max_max_challenge) // TEST sleep(1); - ret = security_server_set_pwd(TEST_PASSWORD, TEST_PASSWORD, UINT_MAX, 0); + ret = security_server_set_pwd(TEST_PASSWORD, SECOND_TEST_PASSWORD, UINT_MAX, 0); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret = " << ret); } @@ -361,12 +360,12 @@ RUNNER_TEST(tc16_security_server_set_pwd_validity) ret = security_server_set_pwd_validity(1); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret = " << ret); + //When trying to set UINT_MAX we should get error. ret = security_server_set_pwd_validity(UINT_MAX); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret = " << ret); + RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_INPUT_PARAM, "ret = " << ret); ret = security_server_set_pwd_validity(2); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret = " << ret); - } /** @@ -540,7 +539,7 @@ RUNNER_TEST(tc24_security_server_attempt_exceeding) sleep(1); ret = security_server_chk_pwd(SECOND_TEST_PASSWORD, &attempt, &max_attempt, &expire_sec); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_PASSWORD_MISMATCH, "ret = " << ret); - RUNNER_ASSERT_MSG(attempt == i + 1, attempt); + RUNNER_ASSERT_MSG(attempt == i, attempt); } printf("DONE\n"); @@ -574,7 +573,7 @@ RUNNER_TEST(tc25_security_server_attempt_exceeding) sleep(1); ret = security_server_chk_pwd(SECOND_TEST_PASSWORD, &attempt, &max_attempt, &expire_sec); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_PASSWORD_MISMATCH, "ret = " << ret); - RUNNER_ASSERT_MSG(attempt == i + 1, "attempt = " << attempt); + RUNNER_ASSERT_MSG(attempt == i, "attempt = " << attempt); } // The check, that exceeds max number -- 2.7.4