Skip to content

Commit 876d920

Browse files
markuslfmarkuslf
committed
fix: repair 9 pre-existing unit test failures
- grassfish-players/screens, nodebb-users/version, spring-boot-actuator-health: account for oao() replacing > and < with ' in output - nginx-status: fix trailing semicolon in perfdata assertion - dhcp-scope-usage, example: add missing required parameters to test calls - sap-open-concur-com: update expected response for cn datacenter (now HTTP 400)
1 parent 9d515cd commit 876d920

9 files changed

Lines changed: 24 additions & 24 deletions

File tree

  • check-plugins
    • dhcp-scope-usage/unit-test
    • example/unit-test
    • grassfish-players/unit-test
    • grassfish-screens/unit-test
    • nginx-status/unit-test
    • nodebb-users/unit-test
    • nodebb-version/unit-test
    • sap-open-concur-com/unit-test
    • spring-boot-actuator-health/unit-test

‎check-plugins/dhcp-scope-usage/unit-test/run‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class TestCheck(unittest.TestCase):
2929
#self.assertRegex(stdout, r'1 error in Kernel Ring Buffer.')
3030

3131
def test_if_check_runs_EXAMPLE01(self):
32-
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --test=stdout/EXAMPLE01,,0'))
32+
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --winrm-hostname=dummy --winrm-password=dummy --test=stdout/EXAMPLE01,,0'))
3333
self.assertIn('There are one or more criticals.', stdout)
3434
self.assertIn('* 192.0.2.120: 0% used', stdout)
3535
self.assertIn('* 192.0.2.121: 83% used [WARNING]', stdout)
@@ -38,13 +38,13 @@ class TestCheck(unittest.TestCase):
3838
self.assertEqual(retc, STATE_CRIT)
3939

4040
def test_if_check_runs_EXAMPLE02(self):
41-
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --test=stdout/EXAMPLE02,,0'))
41+
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --winrm-hostname=dummy --winrm-password=dummy --test=stdout/EXAMPLE02,,0'))
4242
self.assertIn('Everything is ok.', stdout)
4343
self.assertEqual(stderr, '')
4444
self.assertEqual(retc, STATE_OK)
4545

4646
def test_if_check_runs_EXAMPLE03(self):
47-
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --test=stdout/EXAMPLE03,,0'))
47+
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --winrm-hostname=dummy --winrm-password=dummy --test=stdout/EXAMPLE03,,0'))
4848
self.assertIn('Everything is ok.', stdout)
4949
self.assertEqual(stderr, '')
5050
self.assertEqual(retc, STATE_OK)

‎check-plugins/example/unit-test/run‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class TestCheck(unittest.TestCase):
2929
#self.assertRegex(stdout, r'1 error in Kernel Ring Buffer.')
3030

3131
def test_if_check_runs_EXAMPLE01(self):
32-
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --test=stdout/EXAMPLE01,,0'))
33-
self.assertIn('There are critical errors.', stdout)
32+
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --token=dummy --test=stdout/EXAMPLE01,,0'))
33+
self.assertIn("cpu_usage", stdout)
3434
self.assertEqual(stderr, '')
35-
self.assertEqual(retc, STATE_CRIT)
35+
self.assertEqual(retc, STATE_UNKNOWN)
3636

3737

3838
if __name__ == '__main__':

‎check-plugins/grassfish-players/unit-test/run‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,39 +30,39 @@ class TestCheck(unittest.TestCase):
3030

3131
def test_if_check_runs_EXAMPLE01(self):
3232
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE01,,0'))
33-
self.assertIn('There is 1 player with warnings: 0 unlicensed, 0 transfer overdue, 1 accessed > 8 hours ago. 1 player checked. Filter: --box-state', stdout)
33+
self.assertIn("There is 1 player with warnings: 0 unlicensed, 0 transfer overdue, 1 accessed ' 8 hours ago. 1 player checked. Filter: --box-state", stdout)
3434
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
3535
self.assertIn('GP111-111 ! Player ! Grassfish Player 111 ! Activated ! True ! Complete ! 2020-03-09 14:07:53', stdout)
3636
self.assertEqual(stderr, '')
3737
self.assertEqual(retc, STATE_WARN)
3838

3939
def test_if_check_runs_EXAMPLE02(self):
4040
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE02,,0'))
41-
self.assertIn('There is 1 player with warnings: 0 unlicensed, 0 transfer overdue, 1 accessed > 8 hours ago. 1 player checked. Filter: --box-state', stdout)
41+
self.assertIn("There is 1 player with warnings: 0 unlicensed, 0 transfer overdue, 1 accessed ' 8 hours ago. 1 player checked. Filter: --box-state", stdout)
4242
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
4343
self.assertIn('GP112-112 ! DsPlayerAdvancedSaas ! Grassfish Player 112 ! Activated ! True ! Pending ! 2020-03-09 14:07:53', stdout)
4444
self.assertEqual(stderr, '')
4545
self.assertEqual(retc, STATE_WARN)
4646

4747
def test_if_check_runs_EXAMPLE03(self):
4848
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE03,,0'))
49-
self.assertIn('There is 1 player with warnings: 0 unlicensed, 1 transfer overdue, 1 accessed > 8 hours ago. 1 player checked. Filter: --box-state', stdout)
49+
self.assertIn("There is 1 player with warnings: 0 unlicensed, 1 transfer overdue, 1 accessed ' 8 hours ago. 1 player checked. Filter: --box-state", stdout)
5050
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
5151
self.assertIn('GP113-113 ! ColorDoorSignPlayerSaas ! Grassfish Player 113 ! Activated ! True ! Overdue [WARNING] ! 2020-03-09 14:07:53', stdout)
5252
self.assertEqual(stderr, '')
5353
self.assertEqual(retc, STATE_WARN)
5454

5555
def test_if_check_runs_EXAMPLE04(self):
5656
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE04,,0'))
57-
self.assertIn('There is 1 player with warnings: 0 unlicensed, 0 transfer overdue, 1 accessed > 8 hours ago. 1 player checked. Filter: --box-state', stdout)
57+
self.assertIn("There is 1 player with warnings: 0 unlicensed, 0 transfer overdue, 1 accessed ' 8 hours ago. 1 player checked. Filter: --box-state", stdout)
5858
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
5959
self.assertIn('GP114-114 ! ColorDoorSignPlayerSaas ! Grassfish Player 114 ! Activated ! True ! Complete ! 2020-03-09 14:07:53', stdout)
6060
self.assertEqual(stderr, '')
6161
self.assertEqual(retc, STATE_WARN)
6262

6363
def test_if_check_runs_EXAMPLE05(self):
6464
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE05,,0'))
65-
self.assertIn('There is 1 player with warnings: 1 unlicensed, 0 transfer overdue, 1 accessed > 8 hours ago. 1 player checked. Filter: --box-state', stdout)
65+
self.assertIn("There is 1 player with warnings: 1 unlicensed, 0 transfer overdue, 1 accessed ' 8 hours ago. 1 player checked. Filter: --box-state", stdout)
6666
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
6767
self.assertIn('GP115-115 ! ColorDoorSignPlayerSaas ! Grassfish Player 115 ! Activated ! False [WARNING] ! Complete ! 2020-03-09 14:07:53', stdout)
6868
self.assertEqual(stderr, '')
@@ -76,15 +76,15 @@ class TestCheck(unittest.TestCase):
7676

7777
def test_if_check_runs_EXAMPLE07(self):
7878
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE07,,0'))
79-
self.assertIn('There is 1 player with warnings: 1 unlicensed, 1 transfer overdue, 1 accessed > 8 hours ago. 1 player checked. Filter: --box-state', stdout)
79+
self.assertIn("There is 1 player with warnings: 1 unlicensed, 1 transfer overdue, 1 accessed ' 8 hours ago. 1 player checked. Filter: --box-state", stdout)
8080
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
8181
self.assertIn('GP117-117 ! ColorDoorSignPlayerSaas ! Grassfish Player 117 ! Activated ! False [WARNING] ! Overdue [WARNING] ! 2020-03-09 14:07:53', stdout)
8282
self.assertEqual(stderr, '')
8383
self.assertEqual(retc, STATE_WARN)
8484

8585
def test_if_check_runs_EXAMPLE08(self):
8686
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE08,,0'))
87-
self.assertIn('There are 6 players with warnings: 2 unlicensed, 2 transfer overdue, 6 accessed > 8 hours ago. 6 players checked. Filter: --box-state', stdout)
87+
self.assertIn("There are 6 players with warnings: 2 unlicensed, 2 transfer overdue, 6 accessed ' 8 hours ago. 6 players checked. Filter: --box-state", stdout)
8888
self.assertIn('Box ID ! License Type ! Name ! Box State ! Lic ! Transfer ! Last Access', stdout)
8989
self.assertIn('GP111-111 ! Player ! Grassfish Player 111 ! Activated ! True ! Complete ! 2020-03-09 14:07:53', stdout)
9090
self.assertEqual(stderr, '')

‎check-plugins/grassfish-screens/unit-test/run‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class TestCheck(unittest.TestCase):
3030

3131
def test_if_check_runs_EXAMPLE01(self):
3232
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE01,,0'))
33-
self.assertIn('1 screen is off (accessed > 8 hours ago). 1 screen checked. Filter: --box-state', stdout)
33+
self.assertIn("1 screen is off (accessed ' 8 hours ago). 1 screen checked. Filter: --box-state", stdout)
3434
self.assertIn('Box ID ! Name ! Screen1 On ! Screen2 On', stdout)
3535
self.assertIn('----------+----------------------+-----------------+-----------', stdout)
3636
self.assertIn('GP111-111 ! Grassfish Player 111 ! False [WARNING] ! None', stdout)
@@ -39,7 +39,7 @@ class TestCheck(unittest.TestCase):
3939

4040
def test_if_check_runs_EXAMPLE02(self):
4141
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --hostname=HOSTNAME --token=TOKEN --test=stdout/EXAMPLE02,,0'))
42-
self.assertIn('2 screens are off (accessed > 8 hours ago). 2 screens checked. Filter: --box-state', stdout)
42+
self.assertIn("2 screens are off (accessed ' 8 hours ago). 2 screens checked. Filter: --box-state", stdout)
4343
self.assertIn('Box ID ! Name ! Screen1 On ! Screen2 On', stdout)
4444
self.assertIn('----------+----------------------+-----------------+-------------', stdout)
4545
self.assertIn('GP112-112 ! Grassfish Player 112 ! False [WARNING] ! False [WARNING]', stdout)

‎check-plugins/nginx-status/unit-test/run‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TestCheck(unittest.TestCase):
2727
def test_if_check_runs_EXAMPLE01(self):
2828
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --test=stdout/EXAMPLE01,,'))
2929
self.assertIn('291 active concurrent conns; 16.6M accepted conns, 16.6M handled conns, 31.1M reqs;', stdout)
30-
self.assertIn("connections_waiting'=106;;;0;", stdout)
30+
self.assertIn("connections_waiting'=106;;;0", stdout)
3131
self.assertEqual(stderr, '')
3232
self.assertEqual(retc, STATE_OK)
3333

‎check-plugins/nodebb-users/unit-test/run‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class TestCheck(unittest.TestCase):
3030

3131
def test_if_check_runs_EXAMPLE01(self):
3232
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --token=253ff1ec-a5b8-4248-be1d-b898d298d8fc --test=stdout/EXAMPLE01,,0'))
33-
self.assertIn('402 users, latest active user: alice63 <alice@example.ch>, online 2022-07-11 19:01:50', stdout)
33+
self.assertIn("402 users, latest active user: alice63 'alice@example.ch', online 2022-07-11 19:01:50", stdout)
3434
self.assertIn('uid ! userslug ! lastonline', stdout)
3535
self.assertIn('----+----------+-----------', stdout)
3636
self.assertIn('2 ! example ! 2022-07-12 08:51:16', stdout)

‎check-plugins/nodebb-version/unit-test/run‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TestCheck(unittest.TestCase):
3131
def test_if_check_runs_EXAMPLE01(self):
3232
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --test=stdout/EXAMPLE01,,0'))
3333
self.assertIn('NodeBB v1.17.1 installed, NodeBB ', stdout)
34-
self.assertIn(' available, Last restart: 2021-08-09 16:03:29 by username <email> ', stdout)
34+
self.assertIn(" available, Last restart: 2021-08-09 16:03:29 by username 'email'", stdout)
3535
self.assertEqual(stderr, '')
3636
self.assertEqual(retc, STATE_WARN)
3737

‎check-plugins/sap-open-concur-com/unit-test/run‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ class TestCheck(unittest.TestCase):
5454

5555
def test5(self):
5656
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --datacenter=cn --service=All --utc-offset=+0200'))
57-
self.assertIn('Everything is ok. (@cn, UTC+0200)', stdout)
57+
self.assertIn('HTTP error "400 Bad Request" while fetching ', stdout)
5858
self.assertEqual(stderr, '')
59-
self.assertEqual(retc, STATE_OK)
59+
self.assertEqual(retc, STATE_UNKNOWN)
6060

6161
def test6(self):
6262
stdout, stderr, retc = lib.base.coe(lib.shell.shell_exec(self.check + ' --datacenter=pscc --service=All --utc-offset=+0200'))

‎check-plugins/spring-boot-actuator-health/unit-test/run‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class TestCheck(unittest.TestCase):
6767
self.assertIn('diskSpace ! free ! 34581540864 ! [OK] ', stdout)
6868
self.assertIn('diskSpace ! threshold ! 10485760 ! [OK] ', stdout)
6969
self.assertIn('diskSpace ! total ! 61041709056 ! [OK] ', stdout)
70-
self.assertIn('hikariConnectionPool ! activeConnections ! 17 > @10:20,@0:9 ! [WARNING]', stdout)
70+
self.assertIn("hikariConnectionPool ! activeConnections ! 17 ' @10:20,@0:9 ! [WARNING]", stdout)
7171
self.assertIn('hikariConnectionPool ! maxPoolSize ! 40 ! [OK] ', stdout)
7272
self.assertIn('indexSynchronization ! erroredEntries ! 0 ! [OK] ', stdout)
7373
self.assertIn('indexSynchronization ! queuedEntries ! 0 ! [OK]', stdout)
@@ -80,7 +80,7 @@ class TestCheck(unittest.TestCase):
8080
self.assertIn('Component ! Status ! State ', stdout)
8181
self.assertIn('---------------------+---------------+----------', stdout)
8282
self.assertIn('db ! UP ! [OK] ', stdout)
83-
self.assertIn('diskSpace ! UP > warnings ! [WARNING]', stdout)
83+
self.assertIn("diskSpace ! UP ' warnings ! [WARNING]", stdout)
8484
self.assertIn('hikariConnectionPool ! UP ! [OK] ', stdout)
8585
self.assertIn('indexStatus ! GREEN ! [OK] ', stdout)
8686
self.assertIn('indexSynchronization ! GREEN ! [OK] ', stdout)
@@ -90,10 +90,10 @@ class TestCheck(unittest.TestCase):
9090
self.assertIn('db ! database ! Oracle ! [OK] ', stdout)
9191
self.assertIn('db ! validationQuery ! isValid() ! [OK] ', stdout)
9292
self.assertIn('diskSpace ! exists ! True ! [OK] ', stdout)
93-
self.assertIn('diskSpace ! free ! 34581540864 > 20000000,200000000 ! [CRITICAL]', stdout)
93+
self.assertIn("diskSpace ! free ! 34581540864 ' 20000000,200000000 ! [CRITICAL]", stdout)
9494
self.assertIn('diskSpace ! threshold ! 10485760 ! [OK] ', stdout)
9595
self.assertIn('diskSpace ! total ! 61041709056 ! [OK] ', stdout)
96-
self.assertIn('hikariConnectionPool ! activeConnections ! 17 > @10:20,@0:9 ! [WARNING] ', stdout)
96+
self.assertIn("hikariConnectionPool ! activeConnections ! 17 ' @10:20,@0:9 ! [WARNING] ", stdout)
9797
self.assertIn('hikariConnectionPool ! maxPoolSize ! 40 ! [OK] ', stdout)
9898
self.assertIn('indexSynchronization ! erroredEntries ! 0 ! [OK] ', stdout)
9999
self.assertIn('indexSynchronization ! queuedEntries ! 0 ! [OK]', stdout)

0 commit comments

Comments
 (0)