X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_storage.py;h=57c1d70d6cf50c230d78ad82e623c202d29c6973;hb=7af666616104a5c8c1ed56c4170a77412fdef923;hp=449aa514c8686baaaed232f33aef1f420a76052a;hpb=18eda7307e92eeee6a9e2fdd2e810f98d25df654;p=loctrkd.git

diff --git a/test/test_storage.py b/test/test_storage.py
index 449aa51..57c1d70 100644
--- a/test/test_storage.py
+++ b/test/test_storage.py
@@ -7,13 +7,24 @@ from time import sleep
 from typing import Any
 import unittest
 from .common import send_and_drain, TestWithServers
-from gps303.gps303proto import *
-from gps303.ocid_dload import SCHEMA
+from loctrkd.zx303proto import *
+from loctrkd.zx303proto import (
+    STATUS,
+    WIFI_POSITIONING,
+    WIFI_OFFLINE_POSITIONING,
+    WIFI_POSITIONING,
+    LOGIN,
+    HIBERNATION,
+    SETUP,
+)
+from loctrkd.ocid_dload import SCHEMA
 
 
 class Storage(TestWithServers):
     def setUp(self, *args: str, **kwargs: Any) -> None:
-        super().setUp("collector", "storage", "lookaside", "termconfig")
+        super().setUp(
+            "collector", "storage", "rectifier", "termconfig", verbose=True
+        )
         with connect(self.conf.get("opencellid", "dbfn")) as ldb:
             ldb.execute(SCHEMA)
             ldb.executemany(
@@ -184,8 +195,8 @@ class Storage(TestWithServers):
         super().tearDown()
 
     def test_storage(self) -> None:
-        for buf in (
-            LOGIN.In(imei="9999123456780000", ver=9).packed,
+        for msg in (
+            LOGIN.In(imei="9999123456780000", ver=9),
             WIFI_POSITIONING.In(
                 mnc=3,
                 mcc=262,
@@ -198,21 +209,22 @@ class Storage(TestWithServers):
                     (24420, 36243, -78),
                     (24420, 17012, -44),
                 ],
-            ).packed,
-            SETUP.In().packed,
-            STATUS.In(signal=87).packed,
-            HIBERNATION.In().packed,
+            ),
+            SETUP.In(),
+            STATUS.In(signal=87),
+            HIBERNATION.In(),
         ):
-            send_and_drain(self.sock, b"xx" + buf + b"\r\n")
-        self.sock.close()
+            print("Send:", msg)
+            send_and_drain(self.sock, b"xx" + msg.packed + b"\r\n")
         sleep(1)
+        self.sock.close()
         got = set()
         with connect(self.conf.get("storage", "dbfn")) as db:
             for is_incoming, packet in db.execute(
                 "select is_incoming, packet from events"
             ):
                 msg = parse_message(packet, is_incoming=is_incoming)
-                print(msg)
+                print("Stored:", msg)
                 got.add(type(msg))
         self.assertEqual(
             got,