External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix command test wrt gnutls initialize & fix debugging

Browse Source 
The VIR_TEST_DEBUG and VIR_TEST_VERBOSE env vars did not work
because we replaced 'environ' with 'newenv'. Simply calling
virTestGetDebug/Verbose() before replacing the 'environ' ensures
we have processed the env variables.

The gnutls initialization code opens /dev/urandom and keeps that
FD around for later use. We have code which kills off FDs 3-5
to avoid interfereing with our test case. Move the virInitialize
call before this point, so it kills off the gnutls /dev/urandom
FD which is irrelevant for testing purposes

* tests/commandtest.c: Fix test debugging & make it robust against
  opened FDs
This commit is contained in:
Daniel P. Berrange 2011-08-25 12:05:54 +01:00
parent eaddec976e
commit 2d533a465a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/commandtest.c
View File

@ -773,6 +773,13 @@ mymain(void)
setpgid(0, 0); setpgid(0, 0);
setsid(); setsid();
/* Prime the debug/verbose settings from the env vars,
* since we're about to reset 'environ' */
virTestGetDebug();
virTestGetVerbose();
virInitialize();
/* Kill off any inherited fds that might interfere with our /* Kill off any inherited fds that might interfere with our
* testing. */ * testing. */
fd = 3; fd = 3;
@ -782,8 +789,6 @@ mymain(void)
fd = 5; fd = 5;
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
virInitialize();
environ = (char **)newenv; environ = (char **)newenv;
# define DO_TEST(NAME) \ # define DO_TEST(NAME) \