From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8F1D393AC9 for ; Tue, 9 Apr 2024 15:26:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9B4BA1F1CF for ; Tue, 9 Apr 2024 15:26:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Apr 2024 15:26:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9578D421FF for ; Tue, 9 Apr 2024 15:26:07 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 9 Apr 2024 15:25:54 +0200 Message-Id: <20240409132555.364926-19-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240409132555.364926-1-l.wagner@proxmox.com> References: <20240409132555.364926-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 18/19] tests: remove vzdump_notification test X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2024 13:26:14 -0000 With the upcoming changes in how we send notifications, this one really becomes pretty annoying to keep working. The location where templates are looked up are defined in the proxmox_notify crate, so there is no easy way to mock this for testing. The test itself seemed not super valuable, mainly testing if the backup logs are shortened if they ware too long - so they are just removed. Signed-off-by: Lukas Wagner --- test/Makefile | 6 +- test/vzdump_notification_test.pl | 101 ------------------------------- 2 files changed, 1 insertion(+), 106 deletions(-) delete mode 100755 test/vzdump_notification_test.pl diff --git a/test/Makefile b/test/Makefile index 62d75050..743804c8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,7 +5,7 @@ all: export PERLLIB=.. .PHONY: check -check: test-replication test-balloon test-vzdump-notification test-vzdump test-osd +check: test-replication test-balloon test-vzdump test-osd .PHONY: test-balloon test-balloon: @@ -17,10 +17,6 @@ test-replication: replication1.t replication2.t replication3.t replication4.t re replication%.t: replication_test%.pl ./$< -.PHONY: test-vzdump-notification -test-vzdump-notification: - ./vzdump_notification_test.pl - .PHONY: test-vzdump test-vzdump: test-vzdump-guest-included test-vzdump-new diff --git a/test/vzdump_notification_test.pl b/test/vzdump_notification_test.pl deleted file mode 100755 index 631606bb..00000000 --- a/test/vzdump_notification_test.pl +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use lib '..'; - -use Test::More tests => 3; -use Test::MockModule; - -use PVE::VZDump; - -my $STATUS = qr/.*status.*/; -my $NO_LOGFILE = qr/.*Could not open log file.*/; -my $LOG_TOO_LONG = qr/.*Log output was too long.*/; -my $TEST_FILE_PATH = '/tmp/mail_test'; -my $TEST_FILE_WRONG_PATH = '/tmp/mail_test_wrong'; - -sub prepare_mail_with_status { - open(TEST_FILE, '>', $TEST_FILE_PATH); # Removes previous content - print TEST_FILE "start of log file\n"; - print TEST_FILE "status: 0\% this should not be in the mail\n"; - print TEST_FILE "status: 55\% this should not be in the mail\n"; - print TEST_FILE "status: 100\% this should not be in the mail\n"; - print TEST_FILE "end of log file\n"; - close(TEST_FILE); -} - -sub prepare_long_mail { - open(TEST_FILE, '>', $TEST_FILE_PATH); # Removes previous content - # 0.5 MB * 2 parts + the overview tables gives more than 1 MB mail - print TEST_FILE "a" x (1024*1024); - close(TEST_FILE); -} - -my $result_text; -my $result_properties; - -my $mock_notification_module = Test::MockModule->new('PVE::Notify'); -my $mocked_notify = sub { - my ($severity, $title, $text, $properties, $metadata) = @_; - - $result_text = $text; - $result_properties = $properties; -}; -my $mocked_notify_short = sub { - my (@params) = @_; - return $mocked_notify->('', @params); -}; - -$mock_notification_module->mock( - 'notify' => $mocked_notify, - 'info' => $mocked_notify_short, - 'notice' => $mocked_notify_short, - 'warning' => $mocked_notify_short, - 'error' => $mocked_notify_short, -); -$mock_notification_module->mock('cfs_read_file', sub { - my $path = shift; - - if ($path eq 'datacenter.cfg') { - return {}; - } elsif ($path eq 'notifications.cfg' || $path eq 'priv/notifications.cfg') { - return ''; - } else { - die "unexpected cfs_read_file\n"; - } -}); - -my $MAILTO = ['test_address@proxmox.com']; -my $SELF = { - opts => { mailto => $MAILTO }, - cmdline => 'test_command_on_cli', -}; - -my $task = { state => 'ok', vmid => '100', }; -my $tasklist; -sub prepare_test { - $result_text = undef; - $task->{tmplog} = shift; - $tasklist = [ $task ]; -} - -{ - prepare_test($TEST_FILE_WRONG_PATH); - PVE::VZDump::send_notification($SELF, $tasklist, 0, undef, undef, undef); - like($result_properties->{logs}, $NO_LOGFILE, "Missing logfile is detected"); -} -{ - prepare_test($TEST_FILE_PATH); - prepare_mail_with_status(); - PVE::VZDump::send_notification($SELF, $tasklist, 0, undef, undef, undef); - unlike($result_properties->{"status-text"}, $STATUS, "Status are not in text part of mails"); -} -{ - prepare_test($TEST_FILE_PATH); - prepare_long_mail(); - PVE::VZDump::send_notification($SELF, $tasklist, 0, undef, undef, undef); - like($result_properties->{logs}, $LOG_TOO_LONG, "Text part of mails gets shortened"); -} -unlink $TEST_FILE_PATH; -- 2.39.2