msi/tests: automation: Remove unnecessary if (SUCCEEDED(hr)) statements.
This commit is contained in:
parent
187f856e46
commit
0eaf8bc164
|
@ -1387,7 +1387,6 @@ static void test_Session(IDispatch *pSession)
|
||||||
/* Session::EvaluateCondition */
|
/* Session::EvaluateCondition */
|
||||||
hr = Session_EvaluateCondition(pSession, szOneStateFalse, &myint);
|
hr = Session_EvaluateCondition(pSession, szOneStateFalse, &myint);
|
||||||
ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
|
ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
|
||||||
if (SUCCEEDED(hr))
|
|
||||||
ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
|
ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
|
||||||
|
|
||||||
hr = Session_EvaluateCondition(pSession, szOneStateTrue, &myint);
|
hr = Session_EvaluateCondition(pSession, szOneStateTrue, &myint);
|
||||||
|
@ -1404,7 +1403,6 @@ static void test_Session(IDispatch *pSession)
|
||||||
/* Session::EvaluateCondition */
|
/* Session::EvaluateCondition */
|
||||||
hr = Session_EvaluateCondition(pSession, szOneActionFalse, &myint);
|
hr = Session_EvaluateCondition(pSession, szOneActionFalse, &myint);
|
||||||
ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
|
ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);
|
||||||
if (SUCCEEDED(hr))
|
|
||||||
ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
|
ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN);
|
||||||
|
|
||||||
hr = Session_EvaluateCondition(pSession, szOneActionTrue, &myint);
|
hr = Session_EvaluateCondition(pSession, szOneActionTrue, &myint);
|
||||||
|
@ -1463,7 +1461,6 @@ static void test_Installer_RegistryValue(void)
|
||||||
/* Does our key exist? Shouldn't; check with all three possible value parameter types */
|
/* Does our key exist? Shouldn't; check with all three possible value parameter types */
|
||||||
hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet);
|
hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet);
|
||||||
ok(SUCCEEDED(hr), "Installer_RegistryValueE failed, hresult 0x%08x\n", hr);
|
ok(SUCCEEDED(hr), "Installer_RegistryValueE failed, hresult 0x%08x\n", hr);
|
||||||
if (SUCCEEDED(hr))
|
|
||||||
ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n");
|
ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n");
|
||||||
|
|
||||||
memset(szString, 0, sizeof(szString));
|
memset(szString, 0, sizeof(szString));
|
||||||
|
@ -1502,7 +1499,6 @@ static void test_Installer_RegistryValue(void)
|
||||||
bRet = FALSE;
|
bRet = FALSE;
|
||||||
hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet);
|
hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet);
|
||||||
ok(SUCCEEDED(hr), "Installer_RegistryValueE failed, hresult 0x%08x\n", hr);
|
ok(SUCCEEDED(hr), "Installer_RegistryValueE failed, hresult 0x%08x\n", hr);
|
||||||
if (SUCCEEDED(hr))
|
|
||||||
ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n");
|
ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n");
|
||||||
|
|
||||||
memset(szString, 0, sizeof(szString));
|
memset(szString, 0, sizeof(szString));
|
||||||
|
@ -1885,7 +1881,6 @@ static void test_Installer(void)
|
||||||
/* Installer::ProductState for our product code, which should not be installed */
|
/* Installer::ProductState for our product code, which should not be installed */
|
||||||
hr = Installer_ProductState(szProductCode, &iValue);
|
hr = Installer_ProductState(szProductCode, &iValue);
|
||||||
ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr);
|
ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr);
|
||||||
if (SUCCEEDED(hr))
|
|
||||||
ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN);
|
ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN);
|
||||||
|
|
||||||
/* Installer::RelatedProducts for our upgrade code, should not find anything */
|
/* Installer::RelatedProducts for our upgrade code, should not find anything */
|
||||||
|
|
Loading…
Reference in New Issue