Start of a trivial test case for the socket APIs. Only tests
simple server setup & client connect for UNIX sockets so far
* tests/Makefile.am: Add socket test
* tests/virnetsockettest.c: New test case
* tests/testutils.c: Avoid overriding LIBVIRT_DEBUG settings
---
tests/.gitignore | 1 +
tests/Makefile.am | 9 ++-
tests/testutils.c | 8 ++-
tests/virnetsockettest.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 190 insertions(+), 4 deletions(-)
create mode 100644 tests/virnetsockettest.c
diff --git a/tests/.gitignore b/tests/.gitignore
index e3906f0..9c00860 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -30,6 +30,7 @@ statstest
storagepoolxml2xmltest
storagevolxml2xmltest
virbuftest
+virnetsockettest
virshtest
vmx2xmltest
xencapstest
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a235cf..ef78c34 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -74,7 +74,7 @@ EXTRA_DIST = \
check_PROGRAMS = virshtest conftest sockettest \
nodeinfotest qparamtest virbuftest \
- commandtest commandhelper
+ commandtest commandhelper virnetsockettest
if WITH_XEN
check_PROGRAMS += xml2sexprtest sexpr2xmltest \
@@ -159,6 +159,7 @@ TESTS = virshtest \
virbuftest \
sockettest \
commandtest \
+ virnetsockettest \
$(test_scripts)
if WITH_XEN
@@ -361,6 +362,12 @@ commandhelper_SOURCES = \
commandhelper_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\""
commandhelper_LDADD = $(LDADDS)
+virnetsockettest_SOURCES = \
+ virnetsockettest.c testutils.h testutils.c
+virnetsockettest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\""
+virnetsockettest_LDADD = $(LDADDS)
+
+
if WITH_SECDRIVER_SELINUX
seclabeltest_SOURCES = \
seclabeltest.c
diff --git a/tests/testutils.c b/tests/testutils.c
index 17584ac..ea1e5c6 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -481,9 +481,11 @@ int virtTestMain(int argc,
return 1;
virLogSetFromEnv();
- if (virLogDefineOutput(virtTestLogOutput, virtTestLogClose, &testLog,
- 0, 0, NULL, 0) < 0)
- return 1;
+ if (!getenv("LIBVIRT_DEBUG") && !virLogGetNbOutputs()) {
+ if (virLogDefineOutput(virtTestLogOutput, virtTestLogClose, &testLog,
+ 0, 0, NULL, 0) < 0)
+ return 1;
+ }
#if TEST_OOM
if ((oomStr = getenv("VIR_TEST_OOM")) != NULL) {
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
new file mode 100644
index 0000000..de3185f
--- /dev/null
+++ b/tests/virnetsockettest.c
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2006-2010 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Daniel P. Berrange <berra...@redhat.com>
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <signal.h>
+
+#include "testutils.h"
+#include "util.h"
+#include "virterror_internal.h"
+#include "memory.h"
+#include "logging.h"
+#include "ignore-value.h"
+
+#include "rpc/virnetsocket.h"
+
+#define VIR_FROM_THIS VIR_FROM_RPC
+
+static char *argv0;
+static char cwd[PATH_MAX];
+
+static int testSocketUNIXAccept(const void *data ATTRIBUTE_UNUSED)
+{
+ virNetSocketPtr lsock = NULL; /* Listen socket */
+ virNetSocketPtr ssock = NULL; /* Server socket */
+ virNetSocketPtr csock = NULL; /* Client socket */
+ int ret = -1;
+
+ char *path;
+ if (virAsprintf(&path, "%s/%s-test.sock", cwd, argv0) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ if (virNetSocketNewListenUNIX(path, 0700, getgid(), &lsock) < 0)
+ goto cleanup;
+
+ if (virNetSocketListen(lsock) < 0)
+ goto cleanup;
+
+ if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
+ goto cleanup;
+
+ virNetSocketFree(csock);
+
+ if (virNetSocketAccept(lsock, &ssock) != -1) {
+ char c;
+ if (virNetSocketWrite(ssock, &c, 1) != -1) {
+ VIR_DEBUG0("Unexpected client socket present");
+ goto cleanup;
+ }
+ }
+
+
+
+ ret = 0;
+
+cleanup:
+ VIR_FREE(path);
+ return ret;
+}
+
+
+static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
+{
+ virNetSocketPtr lsock = NULL; /* Listen socket */
+ virNetSocketPtr ssock = NULL; /* Server socket */
+ virNetSocketPtr csock = NULL; /* Client socket */
+ int ret = -1;
+
+ char *path;
+ if (virAsprintf(&path, "%s/%s-test.sock", cwd, argv0) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ if (virNetSocketNewListenUNIX(path, 0700, getgid(), &lsock) < 0)
+ goto cleanup;
+
+ if (STRNEQ(virNetSocketLocalAddrString(lsock), "127.0.0.1;0")) {
+ VIR_DEBUG0("Unexpected local address");
+ goto cleanup;
+ }
+
+ if (virNetSocketRemoteAddrString(lsock) != NULL) {
+ VIR_DEBUG0("Unexpected remote address");
+ goto cleanup;
+ }
+
+ if (virNetSocketListen(lsock) < 0)
+ goto cleanup;
+
+ if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
+ goto cleanup;
+
+ if (STRNEQ(virNetSocketLocalAddrString(csock), "127.0.0.1;0")) {
+ VIR_DEBUG0("Unexpected local address");
+ goto cleanup;
+ }
+
+ if (STRNEQ(virNetSocketRemoteAddrString(csock), "127.0.0.1;0")) {
+ VIR_DEBUG0("Unexpected local address");
+ goto cleanup;
+ }
+
+
+ if (virNetSocketAccept(lsock, &ssock) < 0) {
+ VIR_DEBUG0("Unexpected client socket missing");
+ goto cleanup;
+ }
+
+
+ if (STRNEQ(virNetSocketLocalAddrString(ssock), "127.0.0.1;0")) {
+ VIR_DEBUG0("Unexpected local address");
+ goto cleanup;
+ }
+
+ if (STRNEQ(virNetSocketRemoteAddrString(ssock), "127.0.0.1;0")) {
+ VIR_DEBUG0("Unexpected local address");
+ goto cleanup;
+ }
+
+
+ ret = 0;
+
+cleanup:
+ VIR_FREE(path);
+ return ret;
+}
+
+
+static int
+mymain(int argc, char **argv)
+{
+ int ret = 0;
+
+ argv0 = argv[0];
+
+ if (argc > 1) {
+ fprintf(stderr, "Usage: %s\n", argv0);
+ return (EXIT_FAILURE);
+ }
+
+ signal(SIGPIPE, SIG_IGN);
+
+ if (!(getcwd(cwd, sizeof(cwd))))
+ return (EXIT_FAILURE);
+
+ if (virtTestRun("Socket UNIX Accept", 1, testSocketUNIXAccept, NULL) < 0)
+ ret = -1;
+
+ if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
+ ret = -1;
+
+ return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+
+VIRT_TEST_MAIN(mymain)
--
1.7.2.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
