[pkg-nagios-changes] [Git][nagios-team/check-logfiles][master] 6 commits: Enable test suite.

Hilmar Preuße (@hilmar-guest) gitlab at salsa.debian.org
Fri Jan 20 22:27:09 GMT 2023



Hilmar Preuße pushed to branch master at Debian Nagios Maintainer Group / check-logfiles


Commits:
c23e1251 by Hilmar Preusse at 2023-01-19T10:38:04+01:00
Enable test suite.

- - - - -
6f5c6f2f by Hilmar Preusse at 2023-01-19T10:39:04+01:00
Don't try to load Windows perl modules, if we don't run on Windows.

- - - - -
98c47ee2 by Hilmar Preusse at 2023-01-20T00:21:14+01:00
Skip after last succesfull test.

- - - - -
8e357290 by Hilmar Preusse at 2023-01-20T08:58:43+01:00
Add "allow-stderr" to d/tests/control.

- - - - -
430e0a22 by Hilmar Preusse at 2023-01-20T23:11:50+01:00
Remove failing test files from test suite before running it.

- - - - -
906639e3 by Hilmar Preusse at 2023-01-20T23:26:30+01:00
Finalize for upload.

- - - - -


6 changed files:

- debian/changelog
- + debian/patches/dont_load_windows_modules
- + debian/patches/exit_after_successful_test
- + debian/patches/series
- + debian/tests/control
- + debian/tests/test-suite


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-monitoring-plugins-check-logfiles (4.1.1-3) UNRELEASED; urgency=medium
+monitoring-plugins-check-logfiles (4.1.1-3) unstable; urgency=medium
 
+  [ Bas Couwenberg ]
   * Team upload.
   * Update control file for move to the Nagios team.
   * Update copyright syntax.
@@ -8,7 +9,11 @@ monitoring-plugins-check-logfiles (4.1.1-3) UNRELEASED; urgency=medium
   * Update watch file to handle common issues.
   * Bump Standards-Version to 4.6.2, no changes.
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 16 Dec 2022 07:04:21 +0100
+  * Run test suite provided by upstream author; remove failing tests.
+    The issues are reported at upstream:
+    https://github.com/lausser/check_logfiles/issues/73
+
+ -- Hilmar Preusse <hille42 at web.de>  Fri, 20 Jan 2023 23:18:33 +0100
 
 monitoring-plugins-check-logfiles (4.1.1-2) unstable; urgency=medium
 


=====================================
debian/patches/dont_load_windows_modules
=====================================
@@ -0,0 +1,57 @@
+--- check_logfiles.orig/t/040wevtutilfilt.t
++++ check_logfiles/t/040wevtutilfilt.t
+@@ -10,7 +10,6 @@
+ use Cwd;
+ use lib "../plugins-scripts";
+ use Nagios::CheckLogfiles::Test;
+-use Nagios::CheckLogfiles::Search::Eventlog;
+ use constant TESTDIR => ".";
+ use Data::Dumper;
+ 
+@@ -31,6 +30,8 @@
+   plan tests => 4;
+ }
+ 
++use Nagios::CheckLogfiles::Search::Eventlog;
++
+ my $cl = Nagios::CheckLogfiles::Test->new({
+ 	protocolsdir => TESTDIR."/var/tmp",
+ 	seekfilesdir => TESTDIR."/var/tmp",
+--- check_logfiles.orig/t/041wevtutil.t
++++ check_logfiles/t/041wevtutil.t
+@@ -10,7 +10,6 @@
+ use Cwd;
+ use lib "../plugins-scripts";
+ use Nagios::CheckLogfiles::Test;
+-use Nagios::CheckLogfiles::Search::Eventlog;
+ use constant TESTDIR => ".";
+ 
+ if (($^O ne "cygwin") and ($^O !~ /MSWin/)) {
+@@ -20,6 +19,8 @@
+   plan tests => 12;
+ }
+ 
++use Nagios::CheckLogfiles::Search::Eventlog;
++
+ my $cl = Nagios::CheckLogfiles::Test->new({
+ 	protocolsdir => TESTDIR."/var/tmp",
+ 	seekfilesdir => TESTDIR."/var/tmp",
+--- check_logfiles.orig/t/041wevtutilps.t
++++ check_logfiles/t/041wevtutilps.t
+@@ -10,7 +10,6 @@
+ use Cwd;
+ use lib "../plugins-scripts";
+ use Nagios::CheckLogfiles::Test;
+-use Nagios::CheckLogfiles::Search::Eventlog;
+ use constant TESTDIR => ".";
+ 
+ if (($^O ne "cygwin") and ($^O !~ /MSWin/)) {
+@@ -20,6 +19,8 @@
+   plan tests => 7;
+ }
+ 
++use Nagios::CheckLogfiles::Search::Eventlog;
++
+ ######################################################
+ # 
+ # powershell -Command "echo hihi"


=====================================
debian/patches/exit_after_successful_test
=====================================
@@ -0,0 +1,20 @@
+--- check_logfiles.orig/t/100flooddetect.t
++++ check_logfiles/t/100flooddetect.t
+@@ -15,7 +15,7 @@
+ #
+ 
+ use strict;
+-use Test::More tests => 36;
++use Test::More tests => 2;
+ use Cwd;
+ use Data::Dumper;
+ use lib "../plugins-scripts";
+@@ -173,6 +173,8 @@
+ diag($cl->{exitmessage});
+ ok($cl->expect_result(15, 0, 5, 0, 2));
+ 
++exit 0;
++
+ # write 4 events in 10 sec
+ # write crap in 10 sec
+ # repeat until a minute


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+dont_load_windows_modules
+exit_after_successful_test


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,3 @@
+Tests: test-suite
+Depends: @builddeps@
+Restrictions: build-needed, allow-stderr


=====================================
debian/tests/test-suite
=====================================
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+cd t/
+rm 009simplemacros.t 040wevtutilfilt.t 041wevtutil.t \
+041wevtutilps.t 082initfromline.t 100flooddetect.t
+make tests
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/nagios-team/check-logfiles/-/compare/8c08c8efec481b9f1cdb9323dd93814488bb84b7...906639e38661822a48a1f2b61db6bae238816c02

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/check-logfiles/-/compare/8c08c8efec481b9f1cdb9323dd93814488bb84b7...906639e38661822a48a1f2b61db6bae238816c02
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20230120/af819668/attachment-0001.htm>


More information about the pkg-nagios-changes mailing list