mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-01 08:03:58 +00:00
Refresh patches
- Drop fix-unit-tests.patch (no longer needed) Gbp-Dch: full
This commit is contained in:
Timo Röhling
parent
6dbda115ac
commit
bb061340ea
@ -2,6 +2,7 @@ From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
|
||||
Date: Wed, 31 Aug 2022 15:24:06 +0200
|
||||
Subject: Ignore test failures because of stat()
|
||||
|
||||
Forwarded: not-needed
|
||||
---
|
||||
tests/libgit2/repo/init.c | 14 ++++++++------
|
||||
tests/libgit2/repo/template.c | 19 +++++++++++--------
|
||||
@ -10,10 +11,10 @@ Subject: Ignore test failures because of stat()
|
||||
4 files changed, 29 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/tests/libgit2/repo/init.c b/tests/libgit2/repo/init.c
|
||||
index 7cf6742..aec1ec6 100644
|
||||
index d78ec06..17a0ae2 100644
|
||||
--- a/tests/libgit2/repo/init.c
|
||||
+++ b/tests/libgit2/repo/init.c
|
||||
@@ -424,12 +424,14 @@ void test_repo_init__extended_1(void)
|
||||
@@ -443,12 +443,14 @@ void test_repo_init__extended_1(void)
|
||||
cl_assert(!git_repository_is_empty(g_repo));
|
||||
|
||||
cl_git_pass(git_fs_path_lstat(git_repository_path(g_repo), &st));
|
||||
|
||||
10
debian/patches/disable-online-tests.patch
vendored
10
debian/patches/disable-online-tests.patch
vendored
@ -3,23 +3,25 @@ Date: Sun, 28 Aug 2022 17:12:49 +0200
|
||||
Subject: disable-online-tests
|
||||
|
||||
Skip tests that needs an active internet connection
|
||||
|
||||
Forwarded: not-needed
|
||||
---
|
||||
tests/libgit2/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
|
||||
index 280b9a8..e10456b 100644
|
||||
index 866122d..3e6b4e7 100644
|
||||
--- a/tests/libgit2/CMakeLists.txt
|
||||
+++ b/tests/libgit2/CMakeLists.txt
|
||||
@@ -66,6 +66,7 @@ endif()
|
||||
include(AddClarTest)
|
||||
add_clar_test(libgit2_tests offline -v -xonline)
|
||||
add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
|
||||
add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
|
||||
+if(NOT DISABLE_ONLINE_TESTS)
|
||||
add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
|
||||
add_clar_test(libgit2_tests online -v -sonline -xonline::customcert)
|
||||
add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
|
||||
add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
|
||||
@@ -73,3 +74,4 @@ add_clar_test(libgit2_tests ssh -v -sonline::push -sonline::clon
|
||||
@@ -75,3 +76,4 @@ add_clar_test(libgit2_tests ssh -v -sonline::push -sonline::clon
|
||||
add_clar_test(libgit2_tests proxy -v -sonline::clone::proxy)
|
||||
add_clar_test(libgit2_tests auth_clone -v -sonline::clone::cred)
|
||||
add_clar_test(libgit2_tests auth_clone_and_push -v -sonline::clone::push -sonline::push)
|
||||
|
||||
135
debian/patches/fix-unit-tests.patch
vendored
135
debian/patches/fix-unit-tests.patch
vendored
@ -1,135 +0,0 @@
|
||||
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
|
||||
Date: Sun, 28 Aug 2022 17:20:01 +0200
|
||||
Subject: Fix unit tests
|
||||
|
||||
---
|
||||
tests/libgit2/CMakeLists.txt | 2 +-
|
||||
tests/libgit2/network/url/parse.c | 67 ++++-----------------------------------
|
||||
2 files changed, 7 insertions(+), 62 deletions(-)
|
||||
|
||||
diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
|
||||
index e10456b..d85d5dd 100644
|
||||
--- a/tests/libgit2/CMakeLists.txt
|
||||
+++ b/tests/libgit2/CMakeLists.txt
|
||||
@@ -65,7 +65,7 @@ endif()
|
||||
|
||||
include(AddClarTest)
|
||||
add_clar_test(libgit2_tests offline -v -xonline)
|
||||
-add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
|
||||
+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
|
||||
if(NOT DISABLE_ONLINE_TESTS)
|
||||
add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
|
||||
add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
|
||||
diff --git a/tests/libgit2/network/url/parse.c b/tests/libgit2/network/url/parse.c
|
||||
index 8149ba5..729302e 100644
|
||||
--- a/tests/libgit2/network/url/parse.c
|
||||
+++ b/tests/libgit2/network/url/parse.c
|
||||
@@ -65,14 +65,7 @@ void test_network_url_parse__hostname_implied_root_custom_port(void)
|
||||
|
||||
void test_network_url_parse__hostname_implied_root_empty_port(void)
|
||||
{
|
||||
- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:"));
|
||||
- cl_assert_equal_s(conndata.scheme, "http");
|
||||
- cl_assert_equal_s(conndata.host, "example.com");
|
||||
- cl_assert_equal_s(conndata.port, "80");
|
||||
- cl_assert_equal_s(conndata.path, "/");
|
||||
- cl_assert_equal_p(conndata.username, NULL);
|
||||
- cl_assert_equal_p(conndata.password, NULL);
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1);
|
||||
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_net_url_parse(&conndata, "http://example.com:"));
|
||||
}
|
||||
|
||||
void test_network_url_parse__hostname_encoded_password(void)
|
||||
@@ -131,14 +124,7 @@ void test_network_url_parse__hostname_port(void)
|
||||
|
||||
void test_network_url_parse__hostname_empty_port(void)
|
||||
{
|
||||
- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:/resource"));
|
||||
- cl_assert_equal_s(conndata.scheme, "http");
|
||||
- cl_assert_equal_s(conndata.host, "example.com");
|
||||
- cl_assert_equal_s(conndata.port, "80");
|
||||
- cl_assert_equal_s(conndata.path, "/resource");
|
||||
- cl_assert_equal_p(conndata.username, NULL);
|
||||
- cl_assert_equal_p(conndata.password, NULL);
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1);
|
||||
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_net_url_parse(&conndata, "http://example.com:/resource"));
|
||||
}
|
||||
|
||||
void test_network_url_parse__hostname_user_port(void)
|
||||
@@ -221,14 +207,7 @@ void test_network_url_parse__ipv4_implied_root_custom_port(void)
|
||||
|
||||
void test_network_url_parse__ipv4_implied_root_empty_port(void)
|
||||
{
|
||||
- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:"));
|
||||
- cl_assert_equal_s(conndata.scheme, "http");
|
||||
- cl_assert_equal_s(conndata.host, "192.168.1.1");
|
||||
- cl_assert_equal_s(conndata.port, "80");
|
||||
- cl_assert_equal_s(conndata.path, "/");
|
||||
- cl_assert_equal_p(conndata.username, NULL);
|
||||
- cl_assert_equal_p(conndata.password, NULL);
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1);
|
||||
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_net_url_parse(&conndata, "http://192.168.1.1:"));
|
||||
}
|
||||
|
||||
void test_network_url_parse__ipv4_encoded_password(void)
|
||||
@@ -285,14 +264,7 @@ void test_network_url_parse__ipv4_port(void)
|
||||
|
||||
void test_network_url_parse__ipv4_empty_port(void)
|
||||
{
|
||||
- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:/resource"));
|
||||
- cl_assert_equal_s(conndata.scheme, "http");
|
||||
- cl_assert_equal_s(conndata.host, "192.168.1.1");
|
||||
- cl_assert_equal_s(conndata.port, "80");
|
||||
- cl_assert_equal_s(conndata.path, "/resource");
|
||||
- cl_assert_equal_p(conndata.username, NULL);
|
||||
- cl_assert_equal_p(conndata.password, NULL);
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1);
|
||||
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_net_url_parse(&conndata, "http://192.168.1.1:/resource"));
|
||||
}
|
||||
|
||||
void test_network_url_parse__ipv4_user_port(void)
|
||||
@@ -373,27 +345,7 @@ void test_network_url_parse__ipv6_implied_root_custom_port(void)
|
||||
|
||||
void test_network_url_parse__ipv6_implied_root_empty_port(void)
|
||||
{
|
||||
- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:"));
|
||||
- cl_assert_equal_s(conndata.scheme, "http");
|
||||
- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001");
|
||||
- cl_assert_equal_s(conndata.port, "80");
|
||||
- cl_assert_equal_s(conndata.path, "/");
|
||||
- cl_assert_equal_p(conndata.username, NULL);
|
||||
- cl_assert_equal_p(conndata.password, NULL);
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1);
|
||||
-}
|
||||
-
|
||||
-void test_network_url_parse__ipv6_encoded_password(void)
|
||||
-{
|
||||
- cl_git_pass(git_net_url_parse(&conndata,
|
||||
- "https://user:pass%2fis%40bad@[fe80::dcad:beff:fe00:0001]:1234/"));
|
||||
- cl_assert_equal_s(conndata.scheme, "https");
|
||||
- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001");
|
||||
- cl_assert_equal_s(conndata.port, "1234");
|
||||
- cl_assert_equal_s(conndata.path, "/");
|
||||
- cl_assert_equal_s(conndata.username, "user");
|
||||
- cl_assert_equal_s(conndata.password, "pass/is@bad");
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0);
|
||||
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:"));
|
||||
}
|
||||
|
||||
void test_network_url_parse__ipv6_user(void)
|
||||
@@ -437,14 +389,7 @@ void test_network_url_parse__ipv6_port(void)
|
||||
|
||||
void test_network_url_parse__ipv6_empty_port(void)
|
||||
{
|
||||
- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:/resource"));
|
||||
- cl_assert_equal_s(conndata.scheme, "http");
|
||||
- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001");
|
||||
- cl_assert_equal_s(conndata.port, "80");
|
||||
- cl_assert_equal_s(conndata.path, "/resource");
|
||||
- cl_assert_equal_p(conndata.username, NULL);
|
||||
- cl_assert_equal_p(conndata.password, NULL);
|
||||
- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1);
|
||||
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:/resource"));
|
||||
}
|
||||
|
||||
void test_network_url_parse__ipv6_user_port(void)
|
||||
1
debian/patches/handle-bashism.patch
vendored
1
debian/patches/handle-bashism.patch
vendored
@ -2,6 +2,7 @@ From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
|
||||
Date: Sun, 28 Aug 2022 17:42:55 +0200
|
||||
Subject: Use bash for shell script with bashisms
|
||||
|
||||
Forwarded: https://github.com/libgit2/libgit2/pull/6581
|
||||
---
|
||||
tests/resources/push.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,4 +1,3 @@
|
||||
disable-online-tests.patch
|
||||
fix-unit-tests.patch
|
||||
handle-bashism.patch
|
||||
disable-flaky-stat-tests.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user