March 2018 - Wine-Devel - list.winehq.org

[PATCH 3/6] bcrypt: Add support for auth data in AES GCM mode.
by Alistair Leslie-Hughes March 21, 2018

March 21, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c571db7..68bee84 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 3.0 */ static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); +static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -72,7 +73,12 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif -static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + +static int compat_gnutls_cipher_add_auth(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size) { return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } @@ -115,6 +121,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_cipher_tag not found\n"); pgnutls_cipher_tag = compat_gnutls_cipher_tag; } + if (!(pgnutls_cipher_add_auth = wine_dlsym( libgnutls_handle, "gnutls_cipher_add_auth", NULL, 0 ))) + { + WARN("gnutls_cipher_add_auth not found\n"); + pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; + } if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { @@ -1021,6 +1032,19 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_add_auth( key->handle, auth_data, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1164,6 +1188,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1231,6 +1261,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1425,6 +1461,8 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + return status; if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; @@ -1502,6 +1540,8 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + return status; if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; -- 1.9.1

1 0

[PATCH 2/6] bcrypt/tests: Add tests for BCryptDuplicateKey.
by Alistair Leslie-Hughes March 21, 2018

March 21, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9922e41..f67a975 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -45,6 +45,7 @@ static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); @@ -503,7 +504,7 @@ static void test_BCryptGenerateSymmetricKey(void) static UCHAR expected[] = {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; - BCRYPT_KEY_HANDLE key; + BCRYPT_KEY_HANDLE key, key2; UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; ULONG size, len, i; NTSTATUS ret; @@ -550,6 +551,35 @@ static void test_BCryptGenerateSymmetricKey(void) for (i = 0; i < 16; i++) ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + ret = pBCryptDuplicateKey(NULL, &key2, NULL, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + if (0) /* crashes on some Windows versions */ + { + ret = pBCryptDuplicateKey(key, NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + } + + key2 = (void *)0xdeadbeef; + ret = pBCryptDuplicateKey(key, &key2, NULL, 0, 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER), "got %08x\n", ret); + + if (ret == STATUS_SUCCESS) + { + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key2, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + + ret = pBCryptDestroyKey(key2); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + size = 0xdeadbeef; ret = pBCryptDecrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -1063,6 +1093,7 @@ START_TEST(bcrypt) pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt"); + pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey"); pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); -- 1.9.1

1 0

[PATCH 1/6] bcrypt: Implement BCryptDuplicateKey.
by Alistair Leslie-Hughes March 21, 2018

March 21, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 21b54b4..28c2394 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -12,7 +12,7 @@ @ stdcall BCryptDestroyKey(ptr) @ stub BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) -@ stub BCryptDuplicateKey +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index cd44bdf..c571db7 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -953,6 +953,24 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + UCHAR *buffer; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, key_orig->secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->secret, key_orig->secret_len ); + + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->mode = key_orig->mode; + key_copy->block_size = key_orig->block_size; + key_copy->handle = NULL; + key_copy->secret = buffer; + key_copy->secret_len = key_orig->secret_len; + + return STATUS_SUCCESS; +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1094,6 +1112,25 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + UCHAR *buffer; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, key_orig->secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->secret, key_orig->secret_len ); + + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->mode = key_orig->mode; + key_copy->block_size = key_orig->block_size; + key_copy->ref_encrypt = NULL; + key_copy->ref_decrypt = NULL; + key_copy->secret = buffer; + key_copy->secret_len = key_orig->secret_len; + + return STATUS_SUCCESS; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1182,6 +1219,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); @@ -1310,6 +1353,30 @@ NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE return key_export( key, type, output, output_len, size ); } +NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, + UCHAR *object, ULONG object_len, ULONG flags ) +{ + struct key *key_orig = handle; + struct key *key_copy; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags ); + + if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!handle_copy) return STATUS_INVALID_PARAMETER; + if (!(key_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*key_copy) ))) + return STATUS_NO_MEMORY; + + if ((status = key_duplicate( key_orig, key_copy ))) + { + HeapFree( GetProcessHeap(), 0, key_copy ); + return status; + } + + *handle_copy = key_copy; + return STATUS_SUCCESS; +} + NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) { struct key *key = handle; diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 5d5fae0..d0f0f56 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -14,7 +14,7 @@ @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey @ stub BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash -@ stub BCryptDuplicateKey +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms @ stub BCryptEnumContextFunctionProviders -- 1.9.1

1 0

[PATCH] Test for the explorer.exe
by Carlos Vega García March 21, 2018

March 21, 2018

--- configure | 1 + programs/explorer/tests/Makefile.in | 5 ++ programs/explorer/tests/explorer.c | 158 ++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100755 programs/explorer/tests/Makefile.in create mode 100755 programs/explorer/tests/explorer.c diff --git a/configure b/configure index 6324574..9f36b54 100755 --- a/configure +++ b/configure @@ -19220,6 +19220,7 @@ wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer +wine_fn_config_makefile programs/explorer/tests enable_tests wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100755 index 0000000..422465b --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = explorer.exe +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi + +C_SRCS = \ + explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100755 index 0000000..28e1ad3 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,158 @@ +/* + * Unit tests for explorer.exe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <stdio.h> +#include <winbase.h> +#include "dde.h" +#include "ddeml.h" +#include "winuser.h" +#include "shlobj.h" + +static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL (WINAPI *pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void*)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + /* If we end up here we are on NT4+ as Win9x and WinMe don't have the + * notion of administrators (as we need it). + */ + + /* As of Vista we should always use the users directory. Tests with the + * real Administrator account on Windows 7 proved this. + * + * FIXME: We need a better way of identifying Vista+ as currently this check + * also covers Wine and we don't know yet which behavior we want to follow. + */ + if (pSHGetLocalizedName) + return FALSE; + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + + + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + strcpy(title, name); + + trace("\n \n Window name: %s \n \n",name); + for (i = 0; i < 20; i++) + { + Sleep(20 + 20*i); + if ((window = FindWindowA("ExplorerWClass", title)) || + (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + + + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*/ +int explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + LPDWORD lpExitCode; + char cmd[] = {'e','x','p','l','o','r','e','r',' ','/','r','o','o','t',0}; + char windowName[] = {'r','o','o','t',0}; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + /*Checks if the window has been created*/ + if (check_window_exists(windowName)) { + + return TRUE; + + } + return FALSE; +} + +START_TEST(explorer) +{ + init_strings(); + + ok(explorer_available() == TRUE, "explorer is not avaible \n"); + trace("\n Test Done \n "); + +} -- 2.7.4

2 1

[PATCH v2] user32/tests: Fix broadcast test failures on Windows 10
by Alex Henrie March 21, 2018

March 21, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Simply remove the invalid flags tests as Huw suggested dlls/user32/tests/broadcast.c | 60 +++++++++++-------------------------------- 1 file changed, 15 insertions(+), 45 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index afdb536816..2dfdc98b34 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -128,13 +128,6 @@ if (0) /* TODO: Check the hang flags */ ok(0, "Returned: %d\n", ret); } - recips = BSM_APPLICATIONS; - ResetEvent(hevent); - ret = broadcast( BSF_POSTMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); @@ -147,18 +140,6 @@ if (0) /* TODO: Check the hang flags */ ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( 0, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); } /* BSF_SENDNOTIFYMESSAGE and BSF_QUERY are both synchronous within the same process @@ -209,13 +190,6 @@ if (0) /* TODO: Check the hang flags */ ok(0, "Returned: %d\n", ret); } - recips = BSM_APPLICATIONS; - ResetEvent(hevent); - ret = broadcastex( BSF_POSTMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - recips = BSM_APPLICATIONS; ret = broadcastex( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d\n", ret); @@ -227,18 +201,6 @@ if (0) /* TODO: Check the hang flags */ ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcastex( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcastex( 0, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); } static void test_noprivileges(void) @@ -266,8 +228,10 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS; ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok((ret == 1 && WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT) || + (ret == 0 && WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT) /* win10 */, + "Asynchronous message sent instead of synchronous message or no message. Returned: %d error %08x\n", + ret, GetLastError()); ok(recips == BSM_ALLDESKTOPS || recips == BSM_ALL_RECIPS, /* win2k3 */ "Received by: %08x\n", recips); @@ -277,8 +241,10 @@ static void test_noprivileges(void) recips = BSM_ALLCOMPONENTS; ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok((ret == 1 && WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT) || + (ret == 0 && WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT) /* win10 */, + "Asynchronous message sent instead of synchronous message or no message. Returned: %d error %08x\n", + ret, GetLastError()); ok(recips == BSM_ALLCOMPONENTS || recips == BSM_ALL_RECIPS, /* win2k3 */ "Received by: %08x\n", recips); @@ -288,8 +254,10 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok((ret == 1 && WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT) || + (ret == 0 && WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT) /* win10 */, + "Asynchronous message sent instead of synchronous message or no message. Returned: %d error %08x\n", + ret, GetLastError()); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || recips == BSM_APPLICATIONS, /* win2k3 */ "Received by: %08x\n", recips); @@ -300,7 +268,9 @@ static void test_noprivileges(void) ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT || + WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT /* win10 */, + "Asynchronous message sent instead of synchronous message or no message\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || recips == BSM_APPLICATIONS, /* win2k3 */ "Received by: %08x\n", recips); -- 2.16.2

1 0

[PATCH] testbot: Standardize and clean up the Collections initialization.
by Francois Gouget March 21, 2018

March 21, 2018

@PropertyDescriptors does not need to be exported and it does not need to be initialized in a BEGIN block. Add documentation for the CreateXxx() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Branches.pm | 25 +++++++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 40 +++++++++++++--------- testbot/lib/WineTestBot/Jobs.pm | 44 ++++++++++++++----------- testbot/lib/WineTestBot/Patches.pm | 51 ++++++++++++++++------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 40 ++++++++++++---------- testbot/lib/WineTestBot/PendingPatches.pm | 28 +++++++++++----- testbot/lib/WineTestBot/RecordGroups.pm | 27 +++++++++------ testbot/lib/WineTestBot/Records.pm | 32 +++++++++--------- testbot/lib/WineTestBot/Roles.pm | 24 +++++++++----- testbot/lib/WineTestBot/Steps.pm | 44 ++++++++++++++++--------- testbot/lib/WineTestBot/StepsTasks.pm | 37 ++++++++++----------- testbot/lib/WineTestBot/Tasks.pm | 36 ++++++++++++-------- testbot/lib/WineTestBot/UserRoles.pm | 24 +++++++++----- testbot/lib/WineTestBot/Users.pm | 34 +++++++++++-------- testbot/lib/WineTestBot/VMs.pm | 45 ++++++++++++++----------- 15 files changed, 314 insertions(+), 217 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index f5bd9d982..a67832590 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -53,7 +53,7 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects use ObjectModel::BasicPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @@ -71,14 +71,6 @@ sub GetDefaultBranch($) return undef; } -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Branch name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("IsDefault", "Default branch", !1, 1, "B", 1), - ); -} - sub MultipleBranchesPresent($) { my ($self) = @_; @@ -93,6 +85,21 @@ sub CreateItem($) return WineTestBot::Branch->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "Branch name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("IsDefault", "Default branch", !1, 1, "B", 1), +); + +=pod +=over 12 + +=item C<CreateBranches()> + +Creates a collection of Branch objects. + +=back +=cut + sub CreateBranches(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 4b1f6b3c4..87fd15fb2 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -61,20 +61,12 @@ use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateSessions &DeleteSessions &NewSession); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Session id", 1, 1, "A", 32), - CreateItemrefPropertyDescriptor("User", "User", !1, 1, \&CreateUsers, ["UserName"]), - CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), - ); -} sub CreateItem($) { @@ -83,6 +75,29 @@ sub CreateItem($) return WineTestBot::CGI::Session->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Session id", 1, 1, "A", 32), + CreateItemrefPropertyDescriptor("User", "User", !1, 1, \&CreateUsers, ["UserName"]), + CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), +); + +=pod +=over 12 + +=item C<CreateSessions()> + +Creates a collection of Session objects. + +=back +=cut + +sub CreateSessions(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::CGI::Sessions->new("Sessions", "Sessions", "Session", + \@PropertyDescriptors, $ScopeObject); +} + sub DeleteNonPermanentSessions($) { my ($User) = @_; @@ -129,11 +144,4 @@ sub NewSession($$$) return ($ErrMessage, $Session); } -sub CreateSessions(;$) -{ - my ($ScopeObject) = @_; - return WineTestBot::CGI::Sessions->new("Sessions", "Sessions", "Session", - \@PropertyDescriptors, $ScopeObject); -} - 1; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1d0f8bb8f..bcbcae91f 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -404,30 +404,12 @@ use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); -my @PropertyDescriptors; - -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), - CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), - CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), - CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), - CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), - CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), - CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), - CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), - ); -} sub CreateItem($) { @@ -436,6 +418,30 @@ sub CreateItem($) return WineTestBot::Job->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), + CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), + CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), + CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), + CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), + CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), +); + +=pod +=over 12 + +=item C<CreateJobs()> + +Creates a collection of Job objects. + +=back +=cut + sub CreateJobs(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a1d963529..7906f1cb6 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -375,22 +375,6 @@ require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreatePatches); -my @PropertyDescriptors; - -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), - CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), - CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), - CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), - CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40), - ); -} sub CreateItem($) { @@ -399,6 +383,35 @@ sub CreateItem($) return WineTestBot::Patch->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), + CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), + CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), + CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), + CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256), + CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40), +); + +=pod +=over 12 + +=item C<CreatePatches()> + +Creates a collection of Patch objects. + +=back +=cut + +sub CreatePatches(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::Patches->new("Patches", "Patches", "Patch", + \@PropertyDescriptors, $ScopeObject); +} + sub IsPatch($$) { my ($self, $Body) = @_; @@ -539,10 +552,4 @@ sub NewPatch($$$) return undef; } -sub CreatePatches(;$) -{ - my ($ScopeObject) = @_; - return WineTestBot::Patches->new("Patches", "Patches", "Patch", \@PropertyDescriptors, $ScopeObject); -} - 1; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5aae58338..520fb653c 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -161,22 +161,12 @@ use WineTestBot::Patches; use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreatePendingPatchSets); -my @PropertyDescriptors; - -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("EMail", "EMail of series author", 1, 1, "A", 40), - CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), - CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), - ); -} sub CreateItem($) { @@ -185,6 +175,28 @@ sub CreateItem($) return WineTestBot::PendingPatchSet->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("EMail", "EMail of series author", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), + CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), +); + +=pod +=over 12 + +=item C<CreatePendingPatchSets()> + +Creates a collection of PendingPatchSet objects. + +=back +=cut + +sub CreatePendingPatchSets(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::PendingPatchSets->new("PendingPatchSets", "PendingPatchSets", "PendingPatchSet", \@PropertyDescriptors, $ScopeObject); +} + =pod =over 12 @@ -323,10 +335,4 @@ sub CheckForCompleteSet($) return $ErrMessage; } -sub CreatePendingPatchSets(;$) -{ - my ($ScopeObject) = @_; - return WineTestBot::PendingPatchSets->new("PendingPatchSets", "PendingPatchSets", "PendingPatchSet", \@PropertyDescriptors, $ScopeObject); -} - 1; diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index d63ff7e7d..053f7123d 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -51,19 +51,12 @@ use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Patches; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreatePendingPatches); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), - CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), - ); -} sub CreateItem($) { @@ -72,11 +65,28 @@ sub CreateItem($) return WineTestBot::PendingPatch->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), + CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), +); + +=pod +=over 12 + +=item C<CreatePendingPatches()> + +Creates a collection of PendingPatch objects. + +=back +=cut + sub CreatePendingPatches(;$$) { my ($ScopeObject, $PendingPatchSet) = @_; - return WineTestBot::PendingPatches->new("PendingPatches", "PendingPatches", "PendingPatch", \@PropertyDescriptors, $ScopeObject, $PendingPatchSet); + return WineTestBot::PendingPatches->new( + "PendingPatches", "PendingPatches", "PendingPatch", + \@PropertyDescriptors, $ScopeObject, $PendingPatchSet); } 1; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index dfa83aeac..49c1758a0 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -61,22 +61,13 @@ use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Records; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateRecordGroups &CompareRecordGroups &SaveRecord); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), - CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), - CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), - ); -} - sub CreateItem($) { my ($self) = @_; @@ -84,6 +75,22 @@ sub CreateItem($) return WineTestBot::RecordGroup->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), + CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), +); + +=pod +=over 12 + +=item C<CreateRecordGroups()> + +Creates a collection of RecordGroup objects. + +=back +=cut + sub CreateRecordGroups(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 46cf1fe43..98d5ee7d9 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -66,26 +66,13 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors @FlatPropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateRecords); -BEGIN -{ - @PropertyDescriptors = ( - CreateEnumPropertyDescriptor("Type", "Type", 1, 1, ['engine', 'tasks', 'vmresult', 'vmstatus']), - CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 96), - CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), - ); - @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Record group id", 1, 1, "S", 6), - @PropertyDescriptors - ); -} - sub CreateItem($) { my ($self) = @_; @@ -93,15 +80,26 @@ sub CreateItem($) return WineTestBot::Record->new($self); } +my @PropertyDescriptors = ( + CreateEnumPropertyDescriptor("Type", "Type", 1, 1, ['engine', 'tasks', 'vmresult', 'vmstatus']), + CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 96), + CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), +); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 6), + @PropertyDescriptors +); + =pod =over 12 =item C<CreateRecords()> -Creates a collection containing the records of the specified RecordGroup. In -this case the Record objects have no RecordGroupId property. +When given a RecordGroup object returns a collection containing the +corresponding records. In this case the Record objects don't store the key of +their parent. -If no RecordGroup is specified all the table records are returned and the +If no RecordGroup object is specified all the table rows are returned and the Record objects have a RecordGroupId property. =back diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index eed13c301..a617ac14e 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -48,19 +48,12 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects use ObjectModel::BasicPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateRoles); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("IsDefaultRole", "Should new users get this role by default", !1, 1, "B", 1), - ); -} sub CreateItem($) { @@ -69,6 +62,21 @@ sub CreateItem($) return WineTestBot::Role->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("IsDefaultRole", "Should new users get this role by default", !1, 1, "B", 1), +); + +=pod +=over 12 + +=item C<CreateRoles()> + +Creates a collection of Role objects. + +=back +=cut + sub CreateRoles(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index b8dbaecb8..f91b70e3f 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -190,27 +190,12 @@ use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Tasks; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateSteps); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Step no", 1, 1, "N", 2), - CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), - CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), - CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), - CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), - ); -} sub CreateItem($) { @@ -219,6 +204,33 @@ sub CreateItem($) return WineTestBot::Step->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("No", "Step no", 1, 1, "N", 2), + CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), + CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), + CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), + CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), +); + +=pod +=over 12 + +=item C<CreateSteps()> + +Creates a collection containing the steps of the specified Job. In +this case the Step objects don't store the key of their parent. + +If no Job is specified all the table rows are returned and the +Step objects have a JobId property. + +=back +=cut + sub CreateSteps(;$$) { my ($ScopeObject, $Job) = @_; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 79216d4e1..aea4654f4 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -102,31 +102,12 @@ use WineTestBot::Tasks; use WineTestBot::VMs; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateStepsTasks); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), - CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), - CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), - CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), - CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), - ); -} - sub _initialize($$) { my ($self, $Job) = @_; @@ -181,6 +162,22 @@ sub CreateItem($) return WineTestBot::StepTask->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), + CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), + CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), + CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), + CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), + CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), +); + sub CreateStepsTasks(;$$) { my ($ScopeObject, $Job) = @_; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 373da5372..dcc222b52 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -209,25 +209,12 @@ use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::VMs; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateTasks); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Task no", 1, 1, "N", 2), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), - CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), - ); -} sub CreateItem($) { @@ -236,6 +223,27 @@ sub CreateItem($) return WineTestBot::Task->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("No", "Task no", 1, 1, "N", 2), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), + CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), + CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), + CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), +); + +=pod +=over 12 + +=item C<CreateTasks()> + +Creates a collection of Patch objects. + +=back +=cut + sub CreateTasks(;$$) { my ($ScopeObject, $Step) = @_; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 8f7899a9e..417baf994 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -40,23 +40,17 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Roles; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateUserRoles); -BEGIN -{ - @PropertyDescriptors = ( - CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), - ); - -} sub CreateItem($) { @@ -65,6 +59,20 @@ sub CreateItem($) return WineTestBot::UserRole->new($self); } +my @PropertyDescriptors = ( + CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), +); + +=pod +=over 12 + +=item C<CreateUserRoles()> + +Creates a collection of UserRole objects. + +=back +=cut + sub CreateUserRoles(;$$) { my ($ScopeObject, $User) = @_; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index b9745d804..ec89f9b16 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -303,24 +303,12 @@ use WineTestBot::Config; use WineTestBot::UserRoles; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Username", 1, 1, "A", 40), - CreateBasicPropertyDescriptor("EMail", "EMail", !1, 1, "A", 40), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['active', 'disabled', 'deleted']), - CreateBasicPropertyDescriptor("Password", "Password", !1, 1, "A", 49), - CreateBasicPropertyDescriptor("RealName", "Real name", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), - CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), - ); -} sub CreateItem($) { @@ -329,6 +317,26 @@ sub CreateItem($) return WineTestBot::User->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "Username", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("EMail", "EMail", !1, 1, "A", 40), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['active', 'disabled', 'deleted']), + CreateBasicPropertyDescriptor("Password", "Password", !1, 1, "A", 49), + CreateBasicPropertyDescriptor("RealName", "Real name", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), + CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), +); + +=pod +=over 12 + +=item C<CreateUsers()> + +Creates a collection of User objects. + +=back +=cut + sub CreateUsers(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 35bbe2a59..e93208201 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -639,31 +639,13 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateVMs); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), - CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), - CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), - CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), - CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32), - CreateBasicPropertyDescriptor("Hostname", "The VM hostname", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("Description", "Description", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Details", "VM configuration details", !1, !1, "A", 512), - ); -} - sub CreateItem($) { my ($self) = @_; @@ -671,6 +653,31 @@ sub CreateItem($) return WineTestBot::VM->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), + CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), + CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("Hostname", "The VM hostname", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("Description", "Description", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("Details", "VM configuration details", !1, !1, "A", 512), +); + +=pod +=over 12 + +=item C<CreateVMs()> + +Creates a collection of VM objects. + +=back +=cut + sub CreateVMs(;$) { my ($ScopeObject) = @_; -- 2.16.2

1 0

[PATCH] testbot/Janitor: Add --dry-run and --log-only options.
by Francois Gouget March 21, 2018

March 21, 2018

Janitor.pl now prints informational messages to stdout by default. This helps with debugging. The old behavior can be restored by using the --log-only option, like with the other TestBot tools. One can now also invoke it with the --dry-run option to see what it would do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- You can add --log-only to the relevant crontab line if this causes any inconvenience. testbot/bin/Janitor.pl | 141 ++++++++++++++++++++++++++++++++++-------------- testbot/doc/INSTALL.txt | 2 +- 2 files changed, 101 insertions(+), 42 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 41f88d9e7..56e024a67 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Path; @@ -50,10 +52,61 @@ use WineTestBot::RecordGroups; use WineTestBot::Users; use WineTestBot::VMs; +my $LogOnly; +sub Trace(@) +{ + print @_ if (!$LogOnly); + LogMsg @_; +} + +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; +# Grab the command line options +my ($Usage, $DryRun); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--dry-run") + { + $DryRun = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} +# Check parameters +if (defined $Usage) +{ + print "Usage: $Name0 [--dry-run] [--log-only] [--help]\n"; + exit $Usage; +} + + +# +# Main +# + # Delete obsolete Jobs if ($JobPurgeDays != 0) { @@ -61,13 +114,12 @@ if ($JobPurgeDays != 0) $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<"); foreach my $Job (@{$Jobs->GetItems()}) { - LogMsg "Deleting job ", $Job->Id, "\n"; + Trace "Deleting job ", $Job->Id, "\n"; + next if ($DryRun); + $Job->RmTree(); my $ErrMessage = $Jobs->DeleteItem($Job); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + Error "$ErrMessage\n" if (defined $ErrMessage); } } @@ -89,7 +141,9 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - LogMsg "Deleting pending series for ", $Set->EMail, "\n"; + Error "Deleting pending series for ", $Set->EMail, "\n"; + next if ($DryRun); + $Sets->DeleteItem($Set); $MostRecentPatch->Disposition("Incomplete series, discarded"); $MostRecentPatch->Save(); @@ -107,13 +161,12 @@ if ($JobPurgeDays != 0) $Jobs->AddFilter("Patch", [$Patch]); if ($Jobs->IsEmpty()) { - LogMsg "Deleting patch ", $Patch->Id, "\n"; + Trace "Deleting patch ", $Patch->Id, "\n"; + next if ($DryRun); + unlink("$DataDir/patches/" . $Patch->Id); my $ErrMessage = $Patches->DeleteItem($Patch); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + Error "$ErrMessage\n" if (defined $ErrMessage); } } } @@ -128,7 +181,9 @@ if ($JobArchiveDays != 0) { if (defined($Job->Ended) && $Job->Ended < $ArchiveBefore) { - LogMsg "Archiving job ", $Job->Id, "\n"; + Trace "Archiving job ", $Job->Id, "\n"; + next if ($DryRun); + foreach my $Step (@{$Job->Steps->GetItems()}) { unlink $Step->GetDir() . "/" . $Step->FileName; @@ -157,7 +212,7 @@ if (%DeletedUsers or %DeletedVMs) { if (exists $DeletedUsers{$Job->User->Name}) { - LogMsg "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; + Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; delete $DeletedUsers{$Job->User->Name}; } @@ -169,7 +224,7 @@ if (%DeletedUsers or %DeletedVMs) { if (exists $DeletedVMs{$Task->VM->Name}) { - LogMsg "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; delete $DeletedVMs{$Task->VM->Name}; } } @@ -182,15 +237,14 @@ if (%DeletedUsers or %DeletedVMs) foreach my $UserName (keys %DeletedUsers) { my $User = $Users->GetItem($UserName); + Trace "Deleting the $UserName account\n"; + next if ($DryRun); + DeleteSessions($User); my $ErrMessage = $Users->DeleteItem($User); if (defined $ErrMessage) { - LogMsg "Unable to delete the $UserName account: $ErrMessage\n"; - } - else - { - LogMsg "Deleted the $UserName account\n"; + Error "Unable to delete the $UserName account: $ErrMessage\n"; } } } @@ -198,14 +252,13 @@ if (%DeletedUsers or %DeletedVMs) foreach my $VMKey (keys %DeletedVMs) { my $VM = $VMs->GetItem($VMKey); + Trace "Deleting the $VMKey VM\n"; + next if ($DryRun); + my $ErrMessage = $VMs->DeleteItem($VM); if (defined $ErrMessage) { - LogMsg "Unable to delete the $VMKey VM: $ErrMessage\n"; - } - else - { - LogMsg "Deleted the $VMKey VM\n"; + Error "Unable to delete the $VMKey VM: $ErrMessage\n"; } } } @@ -223,41 +276,43 @@ if (opendir(my $dh, "$DataDir/staging")) my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); - if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) - { - if ($Age >= 1 and !unlink $FileName) - { - # The user abandoned the submit procedure half-way through - LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); - } - } - else + if ($Entry !~ /^[0-9a-f]{32}-websubmit_/) { if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) { - LogMsg "Found a suspicious staging file: $Entry\n"; + Trace "Found a suspicious staging file: $Entry\n"; } if ($JobPurgeDays != 0) { if ($Age >= $JobPurgeDays + 7) { - if (!rmtree($FileName)) + Trace "Deleting '$FileName'\n"; + if (!$DryRun and !rmtree($FileName)) { - LogMsg "Could not delete '$FileName': $!\n"; + Error "Could not delete '$FileName': $!\n"; } } elsif ($Age > $JobPurgeDays) { - LogMsg "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; + Error "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; } } } + elsif ($Age >= 1) + { + Trace "Deleting '$FileName'\n"; + if (!$DryRun and !unlink $FileName) + { + # The user abandoned the submit procedure half-way through + Error "Could not delete '$FileName': $!\n"; + } + } } } else { - LogMsg "Unable to open '$DataDir/staging': $!"; + Error "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups @@ -267,10 +322,14 @@ if ($JobPurgeDays != 0) $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<"); foreach my $RecordGroup (@{$RecordGroups->GetItems()}) { - my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); - if (defined($ErrMessage)) + if ($DryRun) + { + Trace "Deleting RecordGroup ", $RecordGroup->Id, "\n"; + } + else { - LogMsg $ErrMessage, "\n"; + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + Error "$ErrMessage\n" if (defined $ErrMessage); } } } diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 15b2b91b9..8827c227d 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -67,7 +67,7 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl + 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl --log-only - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: */20 * * * * $HOME/tools/testbot/scripts/CheckWineTestBot.pl -- 2.16.2

1 0

[PATCH 2/2] testbot: Use human readable durations for the administrator notifications.
by Francois Gouget March 21, 2018

March 21, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 9 ++++----- testbot/lib/WineTestBot/Log.pm | 9 ++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index c0288e75a..fa07d2d20 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -265,15 +265,14 @@ sub Monitor() "$VMKey does not exist anymore"; NotifyAdministrator("The $VMKey VM is not relevant anymore", "The $VMKey VM was offline but ceased to be relevant after ". - Elapsed($Start). " seconds:\n\n$Reason\n"); + PrettyElapsed($Start). ":\n\n$Reason\n"); return 1; } if ($VM->Status ne "offline") { NotifyAdministrator("The $VMKey VM is working again (". $VM->Status .")", "The status of the $VMKey VM unexpectedly switched from offline\n". - "to ". $VM->Status ." after ". Elapsed($Start) - ." seconds."); + "to ". $VM->Status ." after ". PrettyElapsed($Start) ."."); return 0; } @@ -320,7 +319,7 @@ sub Monitor() return 1 if (ChangeStatus("offline", "off", "done")); NotifyAdministrator("The $VMKey VM is working again", "The $VMKey VM started working again after ". - Elapsed($Start) ." seconds."); + PrettyElapsed($Start) ." seconds."); return 0; } } @@ -459,6 +458,6 @@ else Error("Unsupported action $Action!\n"); $Rc = 1; } -LogMsg "$Action on $VMKey completed in ", Elapsed($Start), " s\n"; +LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), " s\n"; exit $Rc; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index f1499dd9a..65782c514 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -26,12 +26,13 @@ WineTestBot::Log - Logging =cut use WineTestBot::Config; +use WineTestBot::Utils; use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed); +(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; @@ -108,4 +109,10 @@ sub Elapsed($) return sprintf("%0.2f", Time()-$Start); } +sub PrettyElapsed($) +{ + my ($Start) = @_; + return DurationToString(Time()-$Start); +} + 1; -- 2.16.2

1 0

[PATCH 1/2] testbot/web: Centralize the conversion of durations to human readable strings.
by Francois Gouget March 21, 2018

March 21, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 30 +++++++++++++++++++++++++++++- testbot/web/Activity.pl | 12 ++---------- testbot/web/Stats.pl | 29 ++--------------------------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5538ecd60..63b906242 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -35,7 +35,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &BuildEMailRecipient); + &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { @@ -121,6 +121,34 @@ sub CreateNewDir($$) } } +sub DurationToString($;$) +{ + my ($Secs, $Raw) = @_; + + return "n/a" if (!defined $Secs); + + my @Parts; + if (!$Raw) + { + my $Mins = int($Secs / 60); + $Secs -= 60 * $Mins; + my $Hours = int($Mins / 60); + $Mins -= 60 * $Hours; + my $Days = int($Hours / 24); + $Hours -= 24 * $Days; + push @Parts, "${Days}d" if ($Days); + push @Parts, "${Hours}h" if ($Hours); + push @Parts, "${Mins}m" if ($Mins); + } + if (!@Parts or int($Secs) != 0) + { + push @Parts, (@Parts or int($Secs) == $Secs) ? + int($Secs) ."s" : + sprintf('%.1fs', $Secs); + } + return join(" ", @Parts); +} + sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_; diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 9655e1492..08e0291ae 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -28,6 +28,7 @@ use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; +use WineTestBot::Utils; use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); @@ -72,16 +73,7 @@ sub _GetHtmlTime($) sub _GetHtmlDuration($) { my ($Secs) = @_; - - return "" if ($Secs < 2); - my $Mins = int($Secs / 60); - my $Hours = int($Mins / 60); - - my @Parts; - push @Parts, "${Hours}h" if ($Hours); - push @Parts, "${Mins}m" if ($Mins %= 60); - push @Parts, "${Secs}s" if ($Secs %= 60); - return "<span class='RecordDuration'>". join(" ", @Parts) ."</span>"; + return ($Secs < 2) ? "" : "<span class='RecordDuration'>". DurationToString($Secs) ."</span>"; } sub _CompareVMs() diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 806a3666c..146740789 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -38,31 +38,6 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole); } -sub _GetDuration($;$) -{ - my ($Secs, $Raw) = @_; - - return "n/a" if (!defined $Secs); - - my @Parts; - if (!$Raw) - { - my $Mins = int($Secs / 60); - my $Hours = int($Mins / 60); - my $Days = int($Hours / 24); - push @Parts, "${Days}d" if ($Days); - my $Part = $Hours - 24 * $Days; - push @Parts, "${Part}h" if ($Part); - $Part = $Mins - 60 * $Hours; - push @Parts, "${Part}m" if ($Part); - $Secs = $Secs - 60 * $Mins; - } - push @Parts, (@Parts or int($Secs) == $Secs) ? - int($Secs) ."s" : - sprintf('%.1fs', $Secs); - return join(" ", @Parts); -} - sub _CompareVMs() { my ($aHost, $bHost) = ($a->GetHost(), $b->GetHost()); @@ -105,7 +80,7 @@ sub _GetStatStr($$;$$) exists $Stats->{"$StatKey.count"}) { my $Avg = _GetAverage($Stats, $StatKey); - return $Avg eq "n/a" ? "n/a" : _GetDuration($Avg, $Flags & $NO_TIME); + return $Avg eq "n/a" ? "n/a" : DurationToString($Avg, $Flags & $NO_TIME); } if ($StatKey =~ /\.size$/ and !($Flags & $NO_AVERAGE) and @@ -124,7 +99,7 @@ sub _GetStatStr($$;$$) } if ($StatKey =~ /(?:\belapsed|\.time(?!\.count))/) { - return _GetDuration($Value, $Flags & $NO_TIME); + return DurationToString($Value, $Flags & $NO_TIME); } if ($StatKey =~ /\.rate$/) { -- 2.16.2

1 0

[PATCH] testbot: Small package documentation tweaks.
by Francois Gouget March 21, 2018

March 21, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 14 ++++++++------ testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index dfa83aeac..426bf60c3 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -21,7 +21,7 @@ package WineTestBot::RecordGroup; =head1 NAME -WineTestBot::RecordGroup - a group of related history records +WineTestBot::RecordGroup - A group of related history records =head1 DESCRIPTION diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 79216d4e1..5f9b2ca98 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -22,12 +22,7 @@ package WineTestBot::StepTask; =head1 NAME -WineTestBot::StepTask - Merged job steps/tasks - -=head1 DESCRIPTION - -This ties together a given WineTestBot::Task object with the corresponding -WineTestBot::Step object. +WineTestBot::StepTask - Merged Step + Task object =cut @@ -93,6 +88,13 @@ package WineTestBot::StepsTasks; WineTestBot::StepsTasks - A collection of StepsTasks objects +=head1 DESCRIPTION + +Provides a flat collection of all the tasks in the specified Job. + +Note that this is an in-memory only collection since it does not correspond to +a specific database table. + =cut use ObjectModel::BasicPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index b9745d804..e9aba5743 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -22,7 +22,7 @@ package WineTestBot::User; =head1 NAME -WineTestBot::Users - A User +WineTestBot::User - A User =cut -- 2.16.2

1 0