ZMQ: fixed warnings

.travis.yml

@@ -1,7 +1,7 @@
 language: c
 install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq curl
+  - sudo apt-get install -qq curl git wget
   - wget http://download.opensuse.org/repositories/home:/laszlo_budai:/syslog-ng/xUbuntu_12.04/Release.key
   - sudo apt-key add Release.key
   - rm -rf Release.key
@@ -11,10 +11,13 @@ install:
   - sudo sh -c 'echo "deb http://download.opensuse.org/repositories/home:/viktorjuhasz/xUbuntu_12.04/ ./" >> /etc/apt/sources.list'
   - sudo apt-get update -qq
   - sudo apt-get install -qq aptitude
-  - sudo aptitude install -q -y pkg-config flex bison liblua5.2-dev libmongo-client-dev syslog-ng-dev libperl-dev python-dev python3-dev libgrok-dev libtokyocabinet-dev libzmq3-dev librdkafka-dev
+  - sudo aptitude install -q -y autoconf libtool build-essential pkg-config flex bison liblua5.2-dev libmongo-client-dev syslog-ng-core syslog-ng-dev libperl-dev python-dev python3-dev libgrok-dev libtokyocabinet-dev libzmq3-dev librdkafka-dev
+  - git clone https://github.com/lmesz/syslog-ng && cd syslog-ng && git checkout remove-fix-relative-path-of-syslog-ng-in-func-test
 before_script:
   - autoreconf -i
 script:
+  - ./configure
+  - make && make func-test
   - travis/build
 compiler:
   - gcc

modules/zmq/Makefile.am

@@ -30,6 +30,8 @@ modules_zmq_libzmq_la_LDFLAGS = \
 modules_zmq_libzmq_la_DEPENDENCIES  = \
         $(MODULE_DEPS_LIBS)
 
+include modules/zmq/tests/Makefile.am
+
 modules/zmq modules/zmq/ mod-zmq: modules/zmq/libzmq.la
 
 else

modules/zmq/scripts/test_pusher.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+import time
+import zmq
+
+def producer():
+    context = zmq.Context()
+    zmq_socket = context.socket(zmq.PUSH)
+    zmq_socket.bind("tcp://127.0.0.1:5558")
+    for num in xrange(1):
+        zmq_socket.send("Almafa!\n")
+
+producer()

modules/zmq/tests/Makefile.am

@@ -0,0 +1,14 @@
+modules_zmq_tests_TESTS = \
+	modules/zmq/tests/test_zmq
+
+check_PROGRAMS += \
+	${modules_zmq_tests_TESTS}
+
+modules_zmq_tests_test_zmq_CFLAGS = \
+	$(INCUBATOR_CFLAGS)
+
+modules_zmq_tests_test_zmq_LDADD = \
+	$(INCUBATOR_TEST_LDADD) $(INCUBATOR_LIBS) \
+	$(top_builddir)/modules/zmq/libzmq.la
+
+include modules/zmq/tests/functional/Makefile.am

modules/zmq/tests/functional/Makefile.am

@@ -0,0 +1,8 @@
+export top_srcdir
+export top_builddir
+
+EXTRA_DIST	+= \
+		modules/zmq/tests/functional/runtests.sh
+
+func-test:
+	@$(top_srcdir)/modules/zmq/tests/functional/runtests.sh

modules/zmq/tests/functional/runtests.sh

@@ -0,0 +1,20 @@
+#! /bin/sh
+top_srcdir=$(cd ${top_srcdir}; pwd)
+top_builddir=$(cd ${top_builddir}; pwd)
+export func_test_dir=$(cd ${top_srcdir}/syslog-ng/tests/functional; pwd)
+
+
+if [ -z "$SYSLOG_NG_BINARY" ]
+then
+  SYSLOG_NG_BINARY=$(which syslog-ng)
+  if [ -z "$SYSLOG_NG_BINARY" ]
+  then
+    echo "Failed to determine syslog-ng binary."
+    exit 1
+  fi
+fi
+
+export SYSLOG_NG_BINARY
+
+${top_srcdir}/modules/zmq/tests/functional/test_zmq_source.py
+${top_srcdir}/modules/zmq/tests/functional/test_zmq_destination.py

modules/zmq/tests/functional/test_suite.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+sys.path.append(os.environ['func_test_dir'])
+
+from func_test import *

modules/zmq/tests/functional/test_zmq_source.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+from control import *
+
+conf = """
+@version: 3.8
+
+source zmq {
+    zmqq();
+};
+
+destination file {
+    file("/tmp/res");
+};
+
+log {
+    source(zmq);
+    destination(file);
+};
+"""
+
+def test_zmq_source_can_receive_a_message():
+    if not start_syslogng(conf, keep_persist=False, verbose=False):
+        sys.exit(42)
+    stop_syslogng()

modules/zmq/tests/test_zmq.c

@@ -0,0 +1,46 @@
+#include <apphook.h>
+#include <libtest/testutils.h>
+
+#include "modules/zmq/zmq-module.h"
+
+void
+test_source_methods(){
+  ZMQSourceDriver *self = g_new0(ZMQSourceDriver, 1);
+
+  zmq_sd_set_host((LogDriver *) self, "example_address");
+  zmq_sd_set_port((LogDriver *) self, 42);
+  assert_string(zmq_sd_get_address(self), "tcp://example_address:42", "Failed to set zmq address");
+  assert_string(zmq_sd_get_persist_name(self), "zmq_source:example_address:42", "Given persist name is not okay");
+  assert_false(zmq_sd_connect(self), "Connection was successful but it shouldn't have been on source site");
+
+  zmq_sd_set_host((LogDriver *) self, "localhost");
+  zmq_sd_set_port((LogDriver *) self, 65530);
+  assert_true(zmq_sd_connect(self), "tcp://localhost:65530", "Failed to set zmq address");
+}
+
+void
+test_destination_methods(){
+  ZMQDestDriver *self = g_new0(ZMQDestDriver, 1);
+
+  zmq_dd_set_host((LogDriver *) self, "almafa");
+  zmq_dd_set_port((LogDriver *) self, 42);
+  assert_string(zmq_dd_get_address(self), "tcp://almafa:42", "The given address is not the expected!");
+  assert_false(zmq_dd_connect(self), "Connection was successfully, but it shouldn't have been on source site");
+
+  zmq_dd_set_host((LogDriver *) self, "*");
+  zmq_dd_set_port((LogDriver *) self, 64444);
+  assert_string(zmq_dd_get_address(self), "tcp://*:64444", "The given address is not the expected!");
+  assert_true(zmq_dd_connect(self), "Failed to connect on destination site");
+}
+
+
+int main()
+{
+  app_startup();
+
+  test_source_methods();
+  test_destination_methods();
+
+  app_shutdown();
+  return 0;
+}