[Unstable] Revert "selftests/tls: Add test for recv(PEEK) spanning across multiple records"
diff mbox series

Message ID 20190220090247.7932-1-juergh@canonical.com
State New
Headers show
Series
  • [Unstable] Revert "selftests/tls: Add test for recv(PEEK) spanning across multiple records"
Related show

Commit Message

Juerg Haefliger Feb. 20, 2019, 9:02 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1816716

This reverts commit c2ad647c6442cf6730ffd86cbadbbce101dea937.

The selftest that was added by the above commit never passed since it
tests a feature (multi-record socket PEEK) that is not fully/properly
implemented yet. So lets remove the test to prevent bogus failures.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 tools/testing/selftests/net/tls.c | 23 -----------------------
 1 file changed, 23 deletions(-)

Comments

Thadeu Lima de Souza Cascardo Feb. 20, 2019, 9:10 a.m. UTC | #1
Should be UBUNTU: SAUCE. Will apply it with that change.

Cascardo.

On Wed, Feb 20, 2019 at 10:02:47AM +0100, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1816716
> 
> This reverts commit c2ad647c6442cf6730ffd86cbadbbce101dea937.
> 
> The selftest that was added by the above commit never passed since it
> tests a feature (multi-record socket PEEK) that is not fully/properly
> implemented yet. So lets remove the test to prevent bogus failures.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  tools/testing/selftests/net/tls.c | 23 -----------------------
>  1 file changed, 23 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
> index fac68d710f35..df9f76aae5f5 100644
> --- a/tools/testing/selftests/net/tls.c
> +++ b/tools/testing/selftests/net/tls.c
> @@ -551,29 +551,6 @@ TEST_F(tls, recv_peek_multiple_records)
>  	EXPECT_EQ(memcmp(test_str, buf, len), 0);
>  }
>  
> -TEST_F(tls, recv_peek_large_buf_mult_recs)
> -{
> -	char const *test_str = "test_read_peek_mult_recs";
> -	char const *test_str_first = "test_read_peek";
> -	char const *test_str_second = "_mult_recs";
> -	int len;
> -	char buf[64];
> -
> -	len = strlen(test_str_first);
> -	EXPECT_EQ(send(self->fd, test_str_first, len, 0), len);
> -
> -	len = strlen(test_str_second) + 1;
> -	EXPECT_EQ(send(self->fd, test_str_second, len, 0), len);
> -
> -	len = sizeof(buf);
> -	memset(buf, 0, len);
> -	EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1);
> -
> -	len = strlen(test_str) + 1;
> -	EXPECT_EQ(memcmp(test_str, buf, len), 0);
> -}
> -
> -
>  TEST_F(tls, pollin)
>  {
>  	char const *test_str = "test_poll";
> -- 
> 2.19.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Thadeu Lima de Souza Cascardo Feb. 20, 2019, 9:12 a.m. UTC | #2
Applied to unstable master branch.

Thanks.
Cascardo.

Patch
diff mbox series

diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index fac68d710f35..df9f76aae5f5 100644
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -551,29 +551,6 @@  TEST_F(tls, recv_peek_multiple_records)
 	EXPECT_EQ(memcmp(test_str, buf, len), 0);
 }
 
-TEST_F(tls, recv_peek_large_buf_mult_recs)
-{
-	char const *test_str = "test_read_peek_mult_recs";
-	char const *test_str_first = "test_read_peek";
-	char const *test_str_second = "_mult_recs";
-	int len;
-	char buf[64];
-
-	len = strlen(test_str_first);
-	EXPECT_EQ(send(self->fd, test_str_first, len, 0), len);
-
-	len = strlen(test_str_second) + 1;
-	EXPECT_EQ(send(self->fd, test_str_second, len, 0), len);
-
-	len = sizeof(buf);
-	memset(buf, 0, len);
-	EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1);
-
-	len = strlen(test_str) + 1;
-	EXPECT_EQ(memcmp(test_str, buf, len), 0);
-}
-
-
 TEST_F(tls, pollin)
 {
 	char const *test_str = "test_poll";