]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
UBUNTU: SAUCE: selftests: net: tls: remove recv_rcvbuf test
authorThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 11 Dec 2019 15:31:09 +0000 (12:31 -0300)
committerSeth Forshee <seth.forshee@canonical.com>
Mon, 16 Dec 2019 19:33:31 +0000 (13:33 -0600)
This test only works when [1] is applied, which was rejected.

Basically, the errors are reported and cleared. In this particular case of tls
sockets, following reads will block.

The test case was originally submitted with the rejected patch, but, then, was
included as part of a different patchset, possibly by mistake.

[1] https://lore.kernel.org/netdev/20191007035323.4360-2-jakub.kicinski@netronome.com/#t

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
tools/testing/selftests/net/tls.c

index 46abcae47dee317494960fd7a45c4beb40b28e98..c4f608dde9bcf5197b5f7f107849e825da32c099 100644 (file)
@@ -726,34 +726,6 @@ TEST_F(tls, recv_lowat)
        EXPECT_EQ(memcmp(send_mem, recv_mem + 10, 5), 0);
 }
 
-TEST_F(tls, recv_rcvbuf)
-{
-       char send_mem[4096];
-       char recv_mem[4096];
-       int rcv_buf = 1024;
-
-       memset(send_mem, 0x1c, sizeof(send_mem));
-
-       EXPECT_EQ(setsockopt(self->cfd, SOL_SOCKET, SO_RCVBUF,
-                            &rcv_buf, sizeof(rcv_buf)), 0);
-
-       EXPECT_EQ(send(self->fd, send_mem, 512, 0), 512);
-       memset(recv_mem, 0, sizeof(recv_mem));
-       EXPECT_EQ(recv(self->cfd, recv_mem, sizeof(recv_mem), 0), 512);
-       EXPECT_EQ(memcmp(send_mem, recv_mem, 512), 0);
-
-       if (self->notls)
-               return;
-
-       EXPECT_EQ(send(self->fd, send_mem, 4096, 0), 4096);
-       memset(recv_mem, 0, sizeof(recv_mem));
-       EXPECT_EQ(recv(self->cfd, recv_mem, sizeof(recv_mem), 0), -1);
-       EXPECT_EQ(errno, EMSGSIZE);
-
-       EXPECT_EQ(recv(self->cfd, recv_mem, sizeof(recv_mem), 0), -1);
-       EXPECT_EQ(errno, EMSGSIZE);
-}
-
 TEST_F(tls, bidir)
 {
        char const *test_str = "test_read";