From: Jeroen van der Heijden Date: Wed, 29 Jul 2020 14:02:32 +0000 (+0200) Subject: Remove log and update tests X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~3^2~6^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=079a67996f367e6de0e5ee96abcec77b76a729dc;p=siridb-server.git Remove log and update tests --- diff --git a/itest/test_tags.py b/itest/test_tags.py index f1d86dcc..47980c75 100644 --- a/itest/test_tags.py +++ b/itest/test_tags.py @@ -174,6 +174,20 @@ class TestTags(TestBase): alter series 'variance', 'pvariance' untag `OTHER` ''') + await self.client0.query(''' + alter series `ALL` where type == float tag `F` + ''') + + await self.client0.query(''' + alter series `ALL` tag `I` + ''') + + await asyncio.sleep(3.0) + + await self.client0.query(''' + alter series `ALL` where type != integer untag `I` + ''') + await self.client1.connect() await self.client2.connect() @@ -185,6 +199,8 @@ class TestTags(TestBase): self.assertEqual(tags, [ ["ALL", 13], ["EMPTY", 0], + ["F", 5], + ["I", 7], ["OTHER", 5], ["SERIES", 4], ["SERIES_FLOAT", 2], @@ -207,6 +223,8 @@ class TestTags(TestBase): self.assertEqual(tags, [ ["ALL", 9], ["EMPTY", 0], + ["F", 5], + ["I", 4], ["OTHER", 4], ["SERIES", 3], ["SERIES_FLOAT", 2], @@ -233,7 +251,10 @@ class TestTags(TestBase): list tags name, series ''') tags = sorted(res['tags']) - self.assertEqual(tags, []) + self.assertEqual(tags, [ + ["F", 5], + ["I", 4], + ]) self.client2.close() self.client1.close() diff --git a/src/siri/net/bserver.c b/src/siri/net/bserver.c index 1a7744a4..f5b66daa 100644 --- a/src/siri/net/bserver.c +++ b/src/siri/net/bserver.c @@ -952,8 +952,6 @@ static void on_empty_tags(sirinet_stream_t * client, sirinet_pkg_t * pkg) sirinet_pkg_t * package = NULL; siridb_t * siridb = client->siridb; - LOGC("on empty tags..."); - if (~siridb->server->flags & SERVER_FLAG_RUNNING) { log_error("Cannot tag series because of having status %d",