From e3c98ad422c7097dd2601f2d096315ffad889412 Mon Sep 17 00:00:00 2001 From: Gabriele Santomaggio Date: Fri, 16 Dec 2016 11:38:15 +0100 Subject: test systemd --- .travis.yml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e37776..e72c806 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,14 @@ sudo: required -language: erlang - -otp_release: -- 18.0 -- 18.1 -- 18.2 -- 18.2.1 -- 18.3 -- 19.0 -- 19.1 - services: - docker before_install: -- kerl list installations -- docker build -t build_ubuntu https://raw.githubusercontent.com/systemd/erlang-sd_notify/master/docker/ubuntu_18_3/Dockerfile -- docker images +- docker build -t build_ubuntu_18_3 docker/ubuntu_18_3/ +- docker build -t build_centos_18_3 docker/centos_18_3/ +- docker build -t build_centos_19 docker/centos_19/ script: -- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_ubuntu_18_3 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_18_3 /bin/sh -c "cd /home/sd/; make all; make test" +- docker run -v $TRAVIS_BUILD_DIR:/home/sd/ build_centos_19 /bin/sh -c "cd /home/sd/; make all; make test" -- cgit v1.2.1 From f4d0613e53b0df0a0b5de1838a0c7d84ca7565da Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 12 Apr 2017 12:40:39 +0200 Subject: Move test message creation to where it belongs Signed-off-by: Peter Lemenkov --- test/sd_notify_test.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sd_notify_test.erl b/test/sd_notify_test.erl index 32a8ac6..414f1bc 100644 --- a/test/sd_notify_test.erl +++ b/test/sd_notify_test.erl @@ -9,7 +9,6 @@ sd_notify_test_() -> sd_notify_test_local("19") -> {ok, CWD} = file:get_cwd(), FakeNotifyUnixSockName = CWD ++ "/fake-notify-udp-sock-" ++ integer_to_list(erlang:phash2(make_ref())), - TestMessage = integer_to_list(erlang:phash2(make_ref())), {ok, FakeNotifyUnixSock} = gen_udp:open(0, [{ifaddr, {local, FakeNotifyUnixSockName}}, {active, false}, list]), os:putenv("NOTIFY_SOCKET", FakeNotifyUnixSockName), @@ -20,6 +19,7 @@ sd_notify_test_local("19") -> { "Try sending message", fun() -> + TestMessage = integer_to_list(erlang:phash2(make_ref())), sd_notify:sd_pid_notify_with_fds(0, 0, TestMessage, [1, 2, 3]), {ok, {_Address, _Port, Packet}} = gen_udp:recv(FakeNotifyUnixSock, length(TestMessage), 1000), ?assertEqual(TestMessage, Packet) -- cgit v1.2.1 From 73cc735709e055490b11d83712aea5a639a100b3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 12 Apr 2017 15:06:20 +0200 Subject: Don't fake list of sockets Don't pass fake list of sockets because it breaks Centos 7 (bug #24). Also check return value. Signed-off-by: Peter Lemenkov --- test/sd_notify_test.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sd_notify_test.erl b/test/sd_notify_test.erl index 414f1bc..72a4d3f 100644 --- a/test/sd_notify_test.erl +++ b/test/sd_notify_test.erl @@ -20,7 +20,7 @@ sd_notify_test_local("19") -> "Try sending message", fun() -> TestMessage = integer_to_list(erlang:phash2(make_ref())), - sd_notify:sd_pid_notify_with_fds(0, 0, TestMessage, [1, 2, 3]), + 1 = sd_notify:sd_pid_notify_with_fds(0, 0, TestMessage, []), {ok, {_Address, _Port, Packet}} = gen_udp:recv(FakeNotifyUnixSock, length(TestMessage), 1000), ?assertEqual(TestMessage, Packet) end -- cgit v1.2.1