[LTP] [PATCH] logrotate: support new rotate debug message

[LTP] [PATCH] logrotate: support new rotate debug message

[Po-Hsu Lin]

This test was found failing on Ubuntu Oracular with:
    grep -q forced from command line (5 rotations) tst_logrotate.out
    failed unexpectedly

This is because the logrotate debug message has been changed in upstream:
https://github.com/logrotate/logrotate/commit/be6a263c87

Include the new debug message to fix this issue.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
---
 testcases/commands/logrotate/logrotate_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testcases/commands/logrotate/logrotate_tests.sh b/testcases/commands/logrotate/logrotate_tests.sh
index 0aa9f12e1..1cd355f02 100755
--- a/testcases/commands/logrotate/logrotate_tests.sh
+++ b/testcases/commands/logrotate/logrotate_tests.sh
@@ -90,7 +90,7 @@ test1()
 	ROD logrotate -fv tst_logrotate.conf > tst_logrotate.out 2>&1
 
 	EXPECT_PASS grep -q "reading config file tst_logrotate.conf" tst_logrotate.out
-	EXPECT_PASS grep -q "forced from command line (5 rotations)" tst_logrotate.out
+	EXPECT_PASS grep -E -q "forced from command line (5 rotations)|forced from command line empty log files are rotated, \(5 rotations\)" tst_logrotate.out
 	EXPECT_PASS grep -E -q "compressing new|log with" tst_logrotate.out
 
 	check_log /var/log/tst_logfile.1.gz
-- 
2.25.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] logrotate: support new rotate debug message

[Wei Gao via ltp]

On Thu, Nov 28, 2024 at 03:28:19PM +0800, Po-Hsu Lin wrote:
> This test was found failing on Ubuntu Oracular with:
>     grep -q forced from command line (5 rotations) tst_logrotate.out
>     failed unexpectedly
> 
> This is because the logrotate debug message has been changed in upstream:
> https://github.com/logrotate/logrotate/commit/be6a263c87
New msg contain extra string "empty log files are rotated" compare with original one but i have not see
any relation with above commit, correct me if i am wrong.
> 
> Include the new debug message to fix this issue.
> 
> Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
> ---
>  testcases/commands/logrotate/logrotate_tests.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/testcases/commands/logrotate/logrotate_tests.sh b/testcases/commands/logrotate/logrotate_tests.sh
> index 0aa9f12e1..1cd355f02 100755
> --- a/testcases/commands/logrotate/logrotate_tests.sh
> +++ b/testcases/commands/logrotate/logrotate_tests.sh
> @@ -90,7 +90,7 @@ test1()
>  	ROD logrotate -fv tst_logrotate.conf > tst_logrotate.out 2>&1
>  
>  	EXPECT_PASS grep -q "reading config file tst_logrotate.conf" tst_logrotate.out
> -	EXPECT_PASS grep -q "forced from command line (5 rotations)" tst_logrotate.out
> +	EXPECT_PASS grep -E -q "forced from command line (5 rotations)|forced from command line empty log files are rotated, \(5 rotations\)" tst_logrotate.out
I guess you forget escape "(" and ")" for the original string after add "-E"
/command line (5 rotations)|forced from/command line \(5 rotations\)|forced from/s 
>  	EXPECT_PASS grep -E -q "compressing new|log with" tst_logrotate.out
>  
>  	check_log /var/log/tst_logfile.1.gz
> -- 
> 2.25.1
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] logrotate: support new rotate debug message

[Petr Vorel]

Hi all,

> This test was found failing on Ubuntu Oracular with:
>     grep -q forced from command line (5 rotations) tst_logrotate.out
>     failed unexpectedly

> This is because the logrotate debug message has been changed in upstream:
> https://github.com/logrotate/logrotate/commit/be6a263c87

> Include the new debug message to fix this issue.
...

FYI alternative patch which removes the test entirely:

https://lore.kernel.org/ltp/20241203100540.445098-1-pvorel@suse.cz/
https://patchwork.ozlabs.org/project/ltp/patch/20241203100540.445098-1-pvorel@suse.cz/

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] logrotate: support new rotate debug message

[Po-Hsu Lin]

On Tue, 3 Dec 2024 at 18:10, Petr Vorel <pvorel@suse.cz> wrote:

> Hi all,
>
> > This test was found failing on Ubuntu Oracular with:
> >     grep -q forced from command line (5 rotations) tst_logrotate.out
> >     failed unexpectedly
>
> > This is because the logrotate debug message has been changed in upstream:
> > https://github.com/logrotate/logrotate/commit/be6a263c87
>
> > Include the new debug message to fix this issue.
> ...
>
> FYI alternative patch which removes the test entirely:
>
> https://lore.kernel.org/ltp/20241203100540.445098-1-pvorel@suse.cz/
>
> https://patchwork.ozlabs.org/project/ltp/patch/20241203100540.445098-1-pvorel@suse.cz/
>
> Hi

I am +1 with removing this test.
Thanks for the review and feedback.
Po-Hsu



> Kind regards,
> Petr
>

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] logrotate: support new rotate debug message

[Petr Vorel]

Hi all,

...
> I am +1 with removing this test.
> Thanks for the review and feedback.
> Po-Hsu

FYI setting this in patchwork as "Not Applicable" due test being removed:
https://github.com/linux-test-project/ltp/commit/bde9fdcfc69aa01f9de87f8083cb6b0c9deb1a44

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp