| Message ID | 20220927110632.1973965-51-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
On Tue, Sep 27, 2022 at 3:09 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > From: Bin Meng <bin.meng@windriver.com> > > Some migration test cases use TLS to communicate, but they fail on > Windows with the following error messages: > > qemu-system-x86_64: TLS handshake failed: Insufficient credentials for that request. > qemu-system-x86_64: TLS handshake failed: Error in the pull function. > query-migrate shows failed migration: TLS handshake failed: Error in the pull function. > > Disable them temporarily. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > I am not familar with the gnutls and simply enabling the gnutls debug > output does not give me an immedidate hint on why it's failing on > Windows. Disable these cases for now until someone or maintainers > who may want to test this on Windows. > > (no changes since v1) Please use g_test_skip() instead of #if blocks. > > tests/qtest/migration-test.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 6f9fe13488..5c1aaa700e 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1402,6 +1402,7 @@ static void test_precopy_unix_dirty_ring(void) > } > > #ifdef CONFIG_GNUTLS > +#ifndef _WIN32 > static void test_precopy_unix_tls_psk(void) > { > g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); > @@ -1414,6 +1415,7 @@ static void test_precopy_unix_tls_psk(void) > > test_precopy_common(&args); > } > +#endif /* _WIN32 */ > > #ifdef CONFIG_TASN1 > static void test_precopy_unix_tls_x509_default_host(void) > @@ -1522,6 +1524,7 @@ static void test_precopy_tcp_plain(void) > } > > #ifdef CONFIG_GNUTLS > +#ifndef _WIN32 > static void test_precopy_tcp_tls_psk_match(void) > { > MigrateCommon args = { > @@ -1532,6 +1535,7 @@ static void test_precopy_tcp_tls_psk_match(void) > > test_precopy_common(&args); > } > +#endif /* _WIN32 */ > > static void test_precopy_tcp_tls_psk_mismatch(void) > { > @@ -1929,6 +1933,7 @@ static void test_multifd_tcp_zstd(void) > #endif > > #ifdef CONFIG_GNUTLS > +#ifndef _WIN32 > static void * > test_migrate_multifd_tcp_tls_psk_start_match(QTestState *from, > QTestState *to) > @@ -1936,6 +1941,7 @@ test_migrate_multifd_tcp_tls_psk_start_match(QTestState *from, > test_migrate_precopy_tcp_multifd_start_common(from, to, "none"); > return test_migrate_tls_psk_start_match(from, to); > } > +#endif /* _WIN32 */ > > static void * > test_migrate_multifd_tcp_tls_psk_start_mismatch(QTestState *from, > @@ -1987,6 +1993,7 @@ test_migrate_multifd_tls_x509_start_reject_anon_client(QTestState *from, > } > #endif /* CONFIG_TASN1 */ > > +#ifndef _WIN32 > static void test_multifd_tcp_tls_psk_match(void) > { > MigrateCommon args = { > @@ -1996,6 +2003,7 @@ static void test_multifd_tcp_tls_psk_match(void) > }; > test_precopy_common(&args); > } > +#endif /* _WIN32 */ > > static void test_multifd_tcp_tls_psk_mismatch(void) > { > @@ -2498,8 +2506,10 @@ int main(int argc, char **argv) > qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); > qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); > #ifdef CONFIG_GNUTLS > +#ifndef _WIN32 > qtest_add_func("/migration/precopy/unix/tls/psk", > test_precopy_unix_tls_psk); > +#endif > > if (has_uffd) { > /* > @@ -2525,8 +2535,10 @@ int main(int argc, char **argv) > > qtest_add_func("/migration/precopy/tcp/plain", test_precopy_tcp_plain); > #ifdef CONFIG_GNUTLS > +#ifndef _WIN32 > qtest_add_func("/migration/precopy/tcp/tls/psk/match", > test_precopy_tcp_tls_psk_match); > +#endif > qtest_add_func("/migration/precopy/tcp/tls/psk/mismatch", > test_precopy_tcp_tls_psk_mismatch); > #ifdef CONFIG_TASN1 > @@ -2570,8 +2582,10 @@ int main(int argc, char **argv) > test_multifd_tcp_zstd); > #endif > #ifdef CONFIG_GNUTLS > +#ifndef _WIN32 > qtest_add_func("/migration/multifd/tcp/tls/psk/match", > test_multifd_tcp_tls_psk_match); > +#endif > qtest_add_func("/migration/multifd/tcp/tls/psk/mismatch", > test_multifd_tcp_tls_psk_mismatch); > #ifdef CONFIG_TASN1 > -- > 2.34.1 >
On Tue, Sep 27, 2022 at 10:33 PM Marc-André Lureau <marcandre.lureau@redhat.com> wrote: > > On Tue, Sep 27, 2022 at 3:09 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > From: Bin Meng <bin.meng@windriver.com> > > > > Some migration test cases use TLS to communicate, but they fail on > > Windows with the following error messages: > > > > qemu-system-x86_64: TLS handshake failed: Insufficient credentials for that request. > > qemu-system-x86_64: TLS handshake failed: Error in the pull function. > > query-migrate shows failed migration: TLS handshake failed: Error in the pull function. > > > > Disable them temporarily. > > > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > > --- > > I am not familar with the gnutls and simply enabling the gnutls debug > > output does not give me an immedidate hint on why it's failing on > > Windows. Disable these cases for now until someone or maintainers > > who may want to test this on Windows. > > > > (no changes since v1) > > Please use g_test_skip() instead of #if blocks. > Is there a QEMU API to detect OS? Regards, Bin
On Tue, Sep 27, 2022 at 6:38 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Tue, Sep 27, 2022 at 10:33 PM Marc-André Lureau > <marcandre.lureau@redhat.com> wrote: > > > > On Tue, Sep 27, 2022 at 3:09 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > > From: Bin Meng <bin.meng@windriver.com> > > > > > > Some migration test cases use TLS to communicate, but they fail on > > > Windows with the following error messages: > > > > > > qemu-system-x86_64: TLS handshake failed: Insufficient credentials for that request. > > > qemu-system-x86_64: TLS handshake failed: Error in the pull function. > > > query-migrate shows failed migration: TLS handshake failed: Error in the pull function. > > > > > > Disable them temporarily. > > > > > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > > > --- > > > I am not familar with the gnutls and simply enabling the gnutls debug > > > output does not give me an immedidate hint on why it's failing on > > > Windows. Disable these cases for now until someone or maintainers > > > who may want to test this on Windows. > > > > > > (no changes since v1) > > > > Please use g_test_skip() instead of #if blocks. > > > > Is there a QEMU API to detect OS? You can use #ifdef WIN32 for that, but don't comment out code that compiles and should be "fixed". > > Regards, > Bin >
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 6f9fe13488..5c1aaa700e 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1402,6 +1402,7 @@ static void test_precopy_unix_dirty_ring(void) } #ifdef CONFIG_GNUTLS +#ifndef _WIN32 static void test_precopy_unix_tls_psk(void) { g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); @@ -1414,6 +1415,7 @@ static void test_precopy_unix_tls_psk(void) test_precopy_common(&args); } +#endif /* _WIN32 */ #ifdef CONFIG_TASN1 static void test_precopy_unix_tls_x509_default_host(void) @@ -1522,6 +1524,7 @@ static void test_precopy_tcp_plain(void) } #ifdef CONFIG_GNUTLS +#ifndef _WIN32 static void test_precopy_tcp_tls_psk_match(void) { MigrateCommon args = { @@ -1532,6 +1535,7 @@ static void test_precopy_tcp_tls_psk_match(void) test_precopy_common(&args); } +#endif /* _WIN32 */ static void test_precopy_tcp_tls_psk_mismatch(void) { @@ -1929,6 +1933,7 @@ static void test_multifd_tcp_zstd(void) #endif #ifdef CONFIG_GNUTLS +#ifndef _WIN32 static void * test_migrate_multifd_tcp_tls_psk_start_match(QTestState *from, QTestState *to) @@ -1936,6 +1941,7 @@ test_migrate_multifd_tcp_tls_psk_start_match(QTestState *from, test_migrate_precopy_tcp_multifd_start_common(from, to, "none"); return test_migrate_tls_psk_start_match(from, to); } +#endif /* _WIN32 */ static void * test_migrate_multifd_tcp_tls_psk_start_mismatch(QTestState *from, @@ -1987,6 +1993,7 @@ test_migrate_multifd_tls_x509_start_reject_anon_client(QTestState *from, } #endif /* CONFIG_TASN1 */ +#ifndef _WIN32 static void test_multifd_tcp_tls_psk_match(void) { MigrateCommon args = { @@ -1996,6 +2003,7 @@ static void test_multifd_tcp_tls_psk_match(void) }; test_precopy_common(&args); } +#endif /* _WIN32 */ static void test_multifd_tcp_tls_psk_mismatch(void) { @@ -2498,8 +2506,10 @@ int main(int argc, char **argv) qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); #ifdef CONFIG_GNUTLS +#ifndef _WIN32 qtest_add_func("/migration/precopy/unix/tls/psk", test_precopy_unix_tls_psk); +#endif if (has_uffd) { /* @@ -2525,8 +2535,10 @@ int main(int argc, char **argv) qtest_add_func("/migration/precopy/tcp/plain", test_precopy_tcp_plain); #ifdef CONFIG_GNUTLS +#ifndef _WIN32 qtest_add_func("/migration/precopy/tcp/tls/psk/match", test_precopy_tcp_tls_psk_match); +#endif qtest_add_func("/migration/precopy/tcp/tls/psk/mismatch", test_precopy_tcp_tls_psk_mismatch); #ifdef CONFIG_TASN1 @@ -2570,8 +2582,10 @@ int main(int argc, char **argv) test_multifd_tcp_zstd); #endif #ifdef CONFIG_GNUTLS +#ifndef _WIN32 qtest_add_func("/migration/multifd/tcp/tls/psk/match", test_multifd_tcp_tls_psk_match); +#endif qtest_add_func("/migration/multifd/tcp/tls/psk/mismatch", test_multifd_tcp_tls_psk_mismatch); #ifdef CONFIG_TASN1