Bug 1239870 - Part 4: Disable broken proxy tunnel tests. r=bwc
☠☠ backed out by 22424f6eeb30 ☠ ☠
authorEric Rahm <erahm@mozilla.com>
Thu, 25 Feb 2016 15:54:04 -0800
changeset 322236 ceb3e1ee7dda59c010b172a8c13b872a4fa65220
parent 322235 8574075bf42f47cde9692541b5e345ff6844c073
child 322237 1d385d4f195d718b74177e7f10ebf1df87496dfe
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc
bugs1239870
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1239870 - Part 4: Disable broken proxy tunnel tests. r=bwc Several of the proxy tunnel tests are broken. The proxy tunnel test is also not run in automation.
media/mtransport/test/proxy_tunnel_socket_unittest.cpp
--- a/media/mtransport/test/proxy_tunnel_socket_unittest.cpp
+++ b/media/mtransport/test/proxy_tunnel_socket_unittest.cpp
@@ -183,47 +183,51 @@ TEST_F(ProxyTunnelSocketTest, TestCreate
 TEST_F(ProxyTunnelSocketTest, TestConnectProxyAddress) {
   int r = nr_socket_connect(nr_socket_, &remote_addr_);
   ASSERT_EQ(0, r);
 
   ASSERT_EQ(0, nr_transport_addr_cmp(socket_impl_->get_connect_addr(), &proxy_addr_,
         NR_TRANSPORT_ADDR_CMP_MODE_ALL));
 }
 
-TEST_F(ProxyTunnelSocketTest, TestConnectProxyRequest) {
+// TODO: Reenable once bug 1251212 is fixed
+TEST_F(ProxyTunnelSocketTest, DISABLED_TestConnectProxyRequest) {
   Connect();
 
   std::string msg = connect_message(kRemoteAddr, kRemotePort, "", kHelloMessage);
   socket_impl_->CheckWriteBuffer(reinterpret_cast<const uint8_t *>(msg.c_str()), msg.size());
 }
 
-TEST_F(ProxyTunnelSocketTest, TestAlpnConnect) {
+// TODO: Reenable once bug 1251212 is fixed
+TEST_F(ProxyTunnelSocketTest, DISABLED_TestAlpnConnect) {
   const std::string alpn = "this,is,alpn";
   int r = nr_proxy_tunnel_config_set_alpn(config_, alpn.c_str());
   EXPECT_EQ(0, r);
 
   Configure();
   Connect();
 
   std::string msg = connect_message(kRemoteAddr, kRemotePort, alpn, kHelloMessage);
   socket_impl_->CheckWriteBuffer(reinterpret_cast<const uint8_t *>(msg.c_str()), msg.size());
 }
 
-TEST_F(ProxyTunnelSocketTest, TestNullAlpnConnect) {
+// TODO: Reenable once bug 1251212 is fixed
+TEST_F(ProxyTunnelSocketTest, DISABLED_TestNullAlpnConnect) {
   int r = nr_proxy_tunnel_config_set_alpn(config_, nullptr);
   EXPECT_EQ(0, r);
 
   Configure();
   Connect();
 
   std::string msg = connect_message(kRemoteAddr, kRemotePort, "", kHelloMessage);
   socket_impl_->CheckWriteBuffer(reinterpret_cast<const uint8_t *>(msg.c_str()), msg.size());
 }
 
-TEST_F(ProxyTunnelSocketTest, TestConnectProxyHostRequest) {
+// TODO: Reenable once bug 1251212 is fixed
+TEST_F(ProxyTunnelSocketTest, DISABLED_TestConnectProxyHostRequest) {
   nr_proxy_tunnel_config_set_proxy(config_, kProxyHost.c_str(), kProxyPort);
   Configure();
   // Because kProxyHost is a domain name and not an IP address,
   // nr_socket_connect will need to resolve an IP address before continuing.  It
   // does that, and assumes that resolving the IP will take some time, so it
   // returns R_WOULDBLOCK.
   //
   // However, In this test setup, the resolution happens inline immediately, so
@@ -236,17 +240,18 @@ TEST_F(ProxyTunnelSocketTest, TestConnec
   // report an error when it doesn't need any further assistance from the
   // calling code, but that's pretty minor.
   Connect(R_WOULDBLOCK);
 
   std::string msg = connect_message(kRemoteAddr, kRemotePort, "", kHelloMessage);
   socket_impl_->CheckWriteBuffer(reinterpret_cast<const uint8_t *>(msg.c_str()), msg.size());
 }
 
-TEST_F(ProxyTunnelSocketTest, TestConnectProxyWrite) {
+// TODO: Reenable once bug 1251212 is fixed
+TEST_F(ProxyTunnelSocketTest, DISABLED_TestConnectProxyWrite) {
   Connect();
 
   socket_impl_->ClearWriteBuffer();
 
   size_t written = 0;
   int r = nr_socket_write(nr_socket_, kHelloMessage.c_str(), kHelloMessage.size(), &written, 0);
   EXPECT_EQ(0, r);
   EXPECT_EQ(kHelloMessage.size(), written);