diff --git a/ChangeLog b/ChangeLog index b31b8956f8..a307459495 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 9 10:22:43 CET 2006 Daniel Veillard + + * tests/reconnect.c: fixed the reconnect test when running as non-root + Wed Nov 8 13:03:41 EDT 2006 Daniel Berrange * src/virshdata/nodeinfo-custom.txt, docs/testnode.xml: Reduce amount diff --git a/tests/reconnect.c b/tests/reconnect.c index eee844f6f4..41466c25c1 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -1,13 +1,24 @@ #include #include #include +#include + +static void errorHandler(void *userData, virErrorPtr error) { +} int main(void) { int id = 0; + int ro = 0; virConnectPtr conn; virDomainPtr dom; - conn = virConnectOpen(""); + virSetErrorFunc(NULL, errorHandler); + + conn = virConnectOpen(NULL); + if (conn == NULL) { + ro = 1; + conn = virConnectOpenReadOnly(NULL); + } if (conn == NULL) { fprintf(stderr, "First virConnectOpen() failed\n"); exit(1); @@ -19,7 +30,10 @@ int main(void) { } virDomainFree(dom); virConnectClose(conn); - conn = virConnectOpen(""); + if (ro == 1) + conn = virConnectOpenReadOnly(NULL); + else + conn = virConnectOpen(NULL); if (conn == NULL) { fprintf(stderr, "Second virConnectOpen() failed\n"); exit(1);