Commit 4b461bc0 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

urlmon: Fixed race in tests.

parent 2102dbe8
...@@ -2650,6 +2650,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) ...@@ -2650,6 +2650,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul)
SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(QueryInterface_IHttpNegotiate2);
SET_EXPECT(GetRootSecurityId); SET_EXPECT(GetRootSecurityId);
SET_EXPECT(QueryInterface_IWindowForBindingUI); SET_EXPECT(QueryInterface_IWindowForBindingUI);
SET_EXPECT(OnProgress_CONNECTING);
} }
if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST)
SET_EXPECT(OnProgress_SENDINGREQUEST); SET_EXPECT(OnProgress_SENDINGREQUEST);
...@@ -2693,6 +2694,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) ...@@ -2693,6 +2694,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul)
CHECK_CALLED(GetRootSecurityId); CHECK_CALLED(GetRootSecurityId);
} }
CLEAR_CALLED(QueryInterface_IWindowForBindingUI); CLEAR_CALLED(QueryInterface_IWindowForBindingUI);
CLEAR_CALLED(OnProgress_CONNECTING);
} }
if(test_protocol == FILE_TEST) if(test_protocol == FILE_TEST)
CHECK_CALLED(OnProgress_SENDINGREQUEST); CHECK_CALLED(OnProgress_SENDINGREQUEST);
...@@ -2942,7 +2944,7 @@ START_TEST(url) ...@@ -2942,7 +2944,7 @@ START_TEST(url)
test_BindToStorage(ABOUT_TEST, 0, TYMED_ISTREAM); test_BindToStorage(ABOUT_TEST, 0, TYMED_ISTREAM);
trace("about test (to file)...\n"); trace("about test (to file)...\n");
test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); test_BindToStorage(ABOUT_TEST, 0, TYMED_FILE);
trace("about test (to object)...\n"); trace("about test (to object)...\n");
test_BindToObject(ABOUT_TEST, 0); test_BindToObject(ABOUT_TEST, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment