From 1804d9f6cfcae158fcf1e5c9da90fdf8cbc6fc18 Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Fri, 23 Mar 2018 11:56:15 +0100 Subject: UDP Socket activation for discovery service Also, timeout communication to the DUT after 60s. --- lib/oeqa/selftest/cases/updater.py | 4 ++-- recipes-sota/aktualizr/files/aktualizr-secondary.socket | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 0e7c11b..06884e5 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -544,7 +544,7 @@ class SecondaryTests(OESelftestTestCase): self.assertEqual(stderr, b'', 'Error: ' + stderr.decode()) def test_secondary_listening(self): - print('Checking aktualizr-secondary is present') + print('Checking aktualizr-secondary service is listening') stdout, stderr, retcode = self.qemu_command('echo test | nc localhost 9030') self.assertEqual(retcode, 0, "Unable to connect to secondary") @@ -591,7 +591,7 @@ def qemu_send_command(port, command): command = ['ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost -p ' + str(port) + ' "' + command + '"'] s2 = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = s2.communicate() + stdout, stderr = s2.communicate(timeout=60) return stdout, stderr, s2.returncode diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.socket b/recipes-sota/aktualizr/files/aktualizr-secondary.socket index 1cb4269..bda8cdb 100644 --- a/recipes-sota/aktualizr/files/aktualizr-secondary.socket +++ b/recipes-sota/aktualizr/files/aktualizr-secondary.socket @@ -1,5 +1,6 @@ [Socket] ListenStream=9030 +ListenDatagram=9030 [Install] WantedBy=sockets.target \ No newline at end of file -- cgit v1.2.3-54-g00ecf