diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 03:03:07 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 03:03:07 +0000 |
| commit | 5abfa4f0bd434526663b4ff776698069a1f3a8da (patch) | |
| tree | 1cfb18bcfe3f0bef2fc84c9eca59bc7efd5afaf9 /jingle | |
| parent | b5e6dc03c1fbc156b71555574ee69e4bcadd8440 (diff) | |
| download | chromium_src-5abfa4f0bd434526663b4ff776698069a1f3a8da.zip chromium_src-5abfa4f0bd434526663b4ff776698069a1f3a8da.tar.gz chromium_src-5abfa4f0bd434526663b4ff776698069a1f3a8da.tar.bz2 | |
Disable some jingle unittests on vs2012
Appears to be invalid iterator usage.
R=akalin@chromium.org
BUG=158570
Review URL: https://chromiumcodereview.appspot.com/11338050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/base/xmpp_connection_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc index 18c4837..05ddfc1 100644 --- a/jingle/notifier/base/xmpp_connection_unittest.cc +++ b/jingle/notifier/base/xmpp_connection_unittest.cc @@ -98,6 +98,7 @@ TEST_F(XmppConnectionTest, CreateDestroy) { &mock_xmpp_connection_delegate_, NULL); } +#if !defined(_MSC_VER) || _MSC_VER < 1700 // http://crbug.com/158570 TEST_F(XmppConnectionTest, ImmediateFailure) { // ChromeAsyncSocket::Connect() will always return false since we're // not setting a valid host, but this gets bubbled up as ERROR_NONE @@ -163,6 +164,7 @@ TEST_F(XmppConnectionTest, RaisedError) { xmpp_connection.weak_xmpp_client_-> SignalStateChange(buzz::XmppEngine::STATE_CLOSED); } +#endif TEST_F(XmppConnectionTest, Connect) { base::WeakPtr<talk_base::Task> weak_ptr; @@ -203,6 +205,7 @@ TEST_F(XmppConnectionTest, MultipleConnect) { }, "more than once"); } +#if !defined(_MSC_VER) || _MSC_VER < 1700 // http://crbug.com/158570 TEST_F(XmppConnectionTest, ConnectThenError) { base::WeakPtr<talk_base::Task> weak_ptr; EXPECT_CALL(mock_xmpp_connection_delegate_, OnConnect(_)). @@ -222,6 +225,7 @@ TEST_F(XmppConnectionTest, ConnectThenError) { SignalStateChange(buzz::XmppEngine::STATE_CLOSED); EXPECT_EQ(NULL, weak_ptr.get()); } +#endif // We don't destroy XmppConnection's task pump on destruction, but it // should still not run any more tasks. |