[MSHTML_WINETEST]

* Skip some tests that result in timeouts.
ROSTESTS-113 ROSTESTS-114

svn path=/trunk/; revision=59050
This commit is contained in:
Amine Khaldi 2013-05-20 11:17:23 +00:00
parent 1b78db23f2
commit d02375a0e3
2 changed files with 16 additions and 1 deletions

View file

@ -2435,10 +2435,14 @@ static void test_flash_ax(void)
/* Set in DoVerb */
CHECK_CALLED(InPlaceObject_GetWindow);
CHECK_CALLED(SetObjectRects);
#if ROSTESTS_114_IS_FIXED
test_ui_activate();
test_container(notif_doc);
test_object_elem(notif_doc);
#endif
win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n");
win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n");
win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n");
SET_EXPECT(UIDeactivate);
SET_EXPECT(Invoke_ENABLED);
@ -2553,7 +2557,10 @@ static void test_event_binding(void)
CHECK_CALLED(FindConnectionPoint);
CHECK_CALLED(Advise);
#if ROSTESTS_114_IS_FIXED
test_event_call();
#endif
win_skip("Skipping test_event_call(). ROSTESTS-114.\n");
SET_EXPECT(InPlaceDeactivate);
SET_EXPECT(Close);

View file

@ -7574,10 +7574,18 @@ START_TEST(htmldoc)
test_HTMLDocument(TRUE, TRUE);
test_HTMLDocument_StreamLoad();
test_HTMLDocument_StreamInitNew();
#if ROSTESTS_113_IS_FIXED
test_editing_mode(FALSE);
#endif
win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n");
test_editing_mode(TRUE);
#if ROSTESTS_113_IS_FIXED
test_HTMLDocument_http(FALSE);
test_HTMLDocument_http(TRUE);
#endif
win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n");
win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n");
test_UIActivate(FALSE, FALSE, FALSE);
test_UIActivate(FALSE, TRUE, FALSE);
test_UIActivate(FALSE, TRUE, TRUE);