From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 1A4B41FF164 for ; Fri, 20 Dec 2024 19:52:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E40EBF3B; Fri, 20 Dec 2024 19:52:22 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 20 Dec 2024 19:52:00 +0100 Message-Id: <20241220185207.519912-6-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241220185207.519912-1-m.carrara@proxmox.com> References: <20241220185207.519912-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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 v2 pve-common 05/12] test: add tests for path_join of PVE::Path 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add not just tests for the path_join function alone, but also a separate test subroutine that checks whether a joined path remains the same after splitting (with path_components) and joining it a second time. Because the path doesn't strictly have to be the *same string* after it is split and joined a second time (it only has to be *logically*), normalize both the re-joined and the expected path before comparison. Signed-off-by: Max Carrara --- Changes v1 --> v2: * NEW: Split from patch 02 test/Path/Makefile | 1 + test/Path/path_join_tests.pl | 310 +++++++++++++++++++++++++++++++++++ 2 files changed, 311 insertions(+) create mode 100755 test/Path/path_join_tests.pl diff --git a/test/Path/Makefile b/test/Path/Makefile index 3f48a38..08d34ac 100644 --- a/test/Path/Makefile +++ b/test/Path/Makefile @@ -1,6 +1,7 @@ TESTS = \ path_components_tests.pl \ path_is_absolute_relative_tests.pl \ + path_join_tests.pl \ TEST_TARGETS = $(addsuffix .t,$(basename ${TESTS})) diff --git a/test/Path/path_join_tests.pl b/test/Path/path_join_tests.pl new file mode 100755 index 0000000..1a2eb72 --- /dev/null +++ b/test/Path/path_join_tests.pl @@ -0,0 +1,310 @@ +#!/usr/bin/env perl + +use lib '../../src'; + +use strict; +use warnings; + +use Test::More; + +use PVE::Path; + +my $cases = [ + { + name => "no components", + components => [], + joined => "", + }, + { + name => "one component, relative", + components => ["foo"], + joined => "foo", + }, + { + name => "one component, with root", + components => ["/", "foo"], + joined => "/foo", + }, + { + name => "current path reference", + components => ["."], + joined => ".", + }, + { + name => "multiple components, relative", + components => ["foo", "bar", "baz"], + joined => "foo/bar/baz", + }, + { + name => "multiple components, with root", + components => ["/", "foo", "bar", "baz"], + joined => "/foo/bar/baz", + }, + { + name => "multiple components, root inbetween", + components => ["foo", "bar", "/", "baz", "quo"], + joined => "/baz/quo", + }, + { + name => "multiple components, with root, root inbetween", + components => ["/", "foo", "bar", "/", "baz", "quo"], + joined => "/baz/quo", + }, + { + name => "multiple components, root at end", + components => ["foo", "bar", "baz", "/"], + joined => "/", + }, + { + name => "multiple components, with root, root at end", + components => ["/", "foo", "bar", "baz", "/"], + joined => "/", + }, + { + name => "multiple components, current path references inbetween", + components => ["foo", ".", "bar", ".", ".", "baz"], + joined => "foo/./bar/././baz", + }, + { + name => "multiple components, with root, current path references inbetween", + components => ["/", "foo", ".", "bar", ".", ".", "baz"], + joined => "/foo/./bar/././baz", + }, + { + name => "multiple components, current path references at end", + components => ["foo", "bar", ".", "."], + joined => "foo/bar/./.", + }, + { + name => "multiple components, with root, current path references at end", + components => ["/", "foo", "bar", ".", "."], + joined => "/foo/bar/./.", + }, + { + name => "multiple components, current path reference at start", + components => [".", "foo", "bar"], + joined => "./foo/bar", + }, + { + name => "multiple components, parent path references inbetween", + components => ["foo", "..", "bar", "..", "..", "baz"], + joined => "foo/../bar/../../baz", + }, + { + name => "multiple components, with root, parent path references inbetween", + components => ["/", "foo", "..", "bar", "..", "..", "baz"], + joined => "/foo/../bar/../../baz", + }, + { + name => "multiple components, parent path references at end", + components => ["foo", "bar", "..", ".."], + joined => "foo/bar/../..", + }, + { + name => "multiple components, with root, parent path references at end", + components => ["/", "foo", "bar", "..", ".."], + joined => "/foo/bar/../..", + }, + { + name => "multiple components, parent path reference at start", + components => ["..", "foo", "bar"], + joined => "../foo/bar", + }, + { + name => "relative paths (2)", + components => ["foo/bar", "baz/quo"], + joined => "foo/bar/baz/quo", + }, + { + name => "relative paths (3)", + components => ["foo/bar", "baz/quo", "one/two/three"], + joined => "foo/bar/baz/quo/one/two/three", + }, + { + name => "relative paths (2) with root inbetween", + components => ["foo/bar", "/","baz/quo"], + joined => "/baz/quo", + }, + { + name => "relative paths (3) with root inbetween", + components => ["foo/bar", "/","baz/quo", "/", "one/two/three"], + joined => "/one/two/three", + }, + { + name => "absolute paths (2)", + components => ["/foo/bar", "/baz/quo"], + joined => "/baz/quo", + }, + { + name => "relative paths (2, not normalized)", + components => ["foo/.///.//.///bar", "baz/.////./quo"], + joined => "foo/.///.//.///bar/baz/.////./quo", + }, + { + name => "relative paths (3, not normalized)", + components => ["foo/.///.//.///bar", "baz/.////./quo", "one/two//three///"], + joined => "foo/.///.//.///bar/baz/.////./quo/one/two//three///", + }, + { + name => "relative paths (2), trailing slashes", + components => ["foo/bar/", "baz/quo/"], + joined => "foo/bar/baz/quo/", + }, + { + name => "relative paths (3), trailing slashes", + components => ["foo/bar/", "baz/quo", "one/two/three/"], + joined => "foo/bar/baz/quo/one/two/three/", + }, + { + name => "relative path and empty path at end", + components => ["foo/bar", ""], + joined => "foo/bar", + }, + { + name => "relative path and empty paths at end (3)", + components => ["foo/bar", "", "", ""], + joined => "foo/bar", + }, + { + name => "relative path and empty path at start", + components => ["", "foo/bar"], + joined => "foo/bar", + }, + { + name => "relative path and empty paths at start (3)", + components => ["", "", "", "foo/bar"], + joined => "foo/bar", + }, + { + name => "relative paths (2) and empty paths at start, middle, end (2)", + components => ["", "", "foo/bar", "", "", "baz/quo", "", ""], + joined => "foo/bar/baz/quo", + }, + { + name => "relative paths (2) and empty paths at start, middle, end (2), with root at start", + components => ["/", "", "", "foo/bar", "", "", "baz/quo", "", ""], + joined => "/foo/bar/baz/quo", + }, + { + name => "relative paths (2) and empty paths at start, middle, end (2), with root in middle", + components => ["", "", "foo/bar", "", "/", "", "baz/quo", "", ""], + joined => "/baz/quo", + }, + { + name => "undef among paths", + components => ["foo", "bar/baz", undef, "quo", "qux"], + joined => undef, + should_throw => 1, + }, +]; + +sub test_path_join : prototype($) { + my ($case) = @_; + + my $name = "path_join: " . $case->{name}; + + my $joined = eval { PVE::Path::path_join($case->{components}->@*); }; + + if ($@) { + if ($case->{should_throw}) { + pass($name); + return; + } + + fail($name); + diag("Failed to join components of path:\n$@"); + return; + } + + if (!is($joined, $case->{joined}, $name)) { + diag("=== Expected ==="); + diag(explain($case->{joined})); + diag("=== Got ==="); + diag(explain($joined)); + } + + return; +} + +# This is basically the same as above, but checks whether the joined path +# is still the same when normalized after splitting and joining it again. +sub test_path_join_consistent : prototype($) { + my ($case) = @_; + + my $name = "path_join (consistency): " . $case->{name}; + + my $joined = eval { PVE::Path::path_join($case->{components}->@*); }; + + if ($@) { + if ($case->{should_throw}) { + pass($name); + return; + } + + fail($name); + diag("Failed to join components of path:\n$@"); + return; + } + + my $joined_again = eval { + my @components = PVE::Path::path_components($joined); + PVE::Path::path_join(@components); + }; + + if ($@) { + fail($name); + diag("Failed to re-join previously joined path:\n$@"); + return; + } + + my $normalized = eval { PVE::Path::path_normalize($joined_again); }; + + if ($@) { + fail($name); + diag("Failed to normalize re-joined path:\n$@"); + return; + } + + my $expected_normalized = eval { PVE::Path::path_normalize($case->{joined}); }; + + if ($@) { + fail($name); + diag("Failed to normalize expected path:\n$@"); + return; + } + + if (!is($normalized, $expected_normalized, $name)) { + diag("=== Expected ==="); + diag(explain($expected_normalized)); + diag("=== Got ==="); + diag(explain($normalized)); + } + + return; +} + +sub main : prototype() { + my $test_subs = [ + \&test_path_join, + \&test_path_join_consistent, + ]; + + plan(tests => scalar($cases->@*) * scalar($test_subs->@*)); + + for my $case ($cases->@*) { + for my $test_sub ($test_subs->@*) { + eval { + # suppress warnings here to make output less noisy for certain tests if necessary + # local $SIG{__WARN__} = sub {}; + $test_sub->($case); + }; + warn "$@\n" if $@; + } + } + + done_testing(); + + return; +} + +main(); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel