lbkit 0.5.19__tar.gz → 0.5.20__tar.gz

{lbkit-0.5.19/lbkit.egg-info → lbkit-0.5.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.5.19
+Version: 0.5.20
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.5.20/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.5.20'

{lbkit-0.5.19 → lbkit-0.5.20}/lbkit/cli.py

@@ -232,6 +232,9 @@ class Command(object):
             ret_code = -1
             msg = str(exc)
             log.error(misc.Color.RED + msg + misc.Color.RESET_ALL)
+        except errors.TestException:
+            log.error(exc)
+            ret_code = -1
 
         return ret_code
 

{lbkit-0.5.19 → lbkit-0.5.20}/lbkit/codegen/idf_interface.py

@@ -619,18 +619,19 @@ class IdfProperty(IdfCtypeRender):
         if self.ctype in ["boolean", "array[boolean]"]:
             return
         pattern = self.idf_data.get("pattern")
-        if pattern:
-            if self.ctype == "string":
+        if self.ctype == "string":
+            if pattern:
                 match = re.match(pattern, self.default)
                 if not match:
                     raise OdfValidateException(f"Fail to validation default value of property {self.name} with pattern \"{pattern}\", get default: {self.default}")
-                return
-            if self.ctype == "array[string]":
+            return
+        if self.ctype == "array[string]":
+            if pattern:
                 for val in self.default:
                     match = re.match(pattern, val)
                     if not match:
                         raise OdfValidateException(f"Fail to validation default value of property {self.name} with pattern \"{pattern}\", get default: {val}")
-                return
+            return
         if self.ctype == "object_path":
             if pattern:
                 match = re.match(pattern, self.default)

{lbkit-0.5.19 → lbkit-0.5.20}/lbkit/codegen/template/client.c.mako

@@ -104,22 +104,39 @@ int ${class_name}_Call_${method.name}(const ${class_name} *object,
 
 % endfor
 static GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque);
+static void _${class_name}_destroy(GclObject *obj);
 
 static GclInterface _${class_name}_interface = {
     .create = _${class_name}_create,
+    .destroy = _${class_name}_destroy,
     .is_remote = 1,
     .name = "${intf.name}",
     .properties = (GclProperty *)&${properties},
     .interface = NULL, /* load from usr/share/dbus-1/interfaces/${intf.name}.xml by gcl_init */
 };
 
+/**
+ * @brief 销毁对象
+ *
+ * @param gcl_obj 待销毁的对象句柄
+ */
+static void _${class_name}_destroy(GclObject *gcl_obj)
+{
+    g_assert(gcl_obj);
+    ${class_name} *obj = (${class_name} *)gcl_obj;
+    g_rec_mutex_clear(obj->_base.lock);
+    g_free(obj->_base.lock);
+    ${intf.alias}_clean(obj);
+    memset(obj, 0, sizeof(${class_name}));
+}
+
 /**
  * @brief 分配对象
  *
  * @param obj_name 对象名，需要由调用者分配内存
  * @param opaque 上层应用需要写入对象的用户数据，由上层应用使用
  */
-GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque)
+static GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque)
 {
     ${class_name} *obj = g_new0(${class_name}, 1);
     memcpy(obj->_base.magic, GCL_MAGIC, strlen(GCL_MAGIC) + 1);

{lbkit-0.5.19 → lbkit-0.5.20}/lbkit/codegen/template/server.c.mako

@@ -234,11 +234,13 @@ gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const
 
 % endfor
 static GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque);
+static void _${class_name}_destroy(GclObject *obj);
 static void _load_from_odf(yaml_document_t *doc, yaml_node_t *node, GclObject *gcl_obj,
     property_reference_loaded ref_loaded, gpointer user_data);
 
 static GclInterface _${class_name}_interface = {
     .create = _${intf.alias}_create,
+    .destroy = _${class_name}_destroy,
     .validate_odf = ${intf.name.replace(".", "_")}_validate_odf,
     .load_from_odf = _load_from_odf,
     .is_remote = 0,
@@ -251,6 +253,7 @@ static GclInterface _${class_name}_interface = {
 static void _load_odf_as_prop_${prop.name}(yaml_document_t *doc, GHashTable *prop_table,
     ${class_name} *obj, property_reference_loaded ref_loaded, gpointer user_data)
 {
+    __attribute__((unused)) gint i = 0;
     const gchar *flags = NULL;
     yaml_node_t *val = g_hash_table_lookup(prop_table, "_${prop.name}_flags");
     if (val && val->type == YAML_SCALAR_NODE) {
@@ -259,6 +262,55 @@ static void _load_odf_as_prop_${prop.name}(yaml_document_t *doc, GHashTable *pro
     val = g_hash_table_lookup(prop_table, "${prop.name}");
     ## validate接口在加载odf前完成属性是否必选校验，此处如果是必选属性一定存在
     if (!val) {
+        ## 设置默认值
+        % if prop.default:
+            % if prop.ctype == "boolean":
+                % if prop.default:
+        obj->${prop.name} = TRUE;
+                % endif
+            % elif prop.ctype in ["byte", "int16", "uint16", "int32", "uint32", "int64", "uint64", "size", "ssize", "double"]:
+                    % if prop.ctype == "uint64":
+        obj->${prop.name} = ${prop.default}UL;
+                    % elif prop.ctype == "int64":
+        obj->${prop.name} = ${prop.default}LL;
+                    % else:
+        obj->${prop.name} = ${prop.default};
+                    % endif
+            % elif prop.ctype in ["object_path", "string", "signature"]:
+        obj->${prop.name} = g_strdup("${prop.default}");
+            % elif prop.ctype == "array[boolean]":
+        i = 0;
+        obj->n_${prop.name} = ${len(prop.default)};
+        obj->${prop.name} = g_new0(gboolean, obj->n_${prop.name});
+                % for val in prop.default:
+                    % if val:
+        obj->${prop.name}[i++] = TRUE;
+                    % else:
+        obj->${prop.name}[i++] = FALSE;
+                    % endif
+                % endfor
+            % elif prop.ctype in ["array[byte]", "array[int16]", "array[uint16]", "array[int32]", "array[uint32]", "array[int64]", "array[uint64]", "array[size]", "array[ssize]", "array[double]"]:
+<% ctype = prop.ctype[6:-1]%>
+        i = 0;
+        obj->n_${prop.name} = ${len(prop.default)};
+        obj->${prop.name} = g_new0(g${ctype},  obj->n_${prop.name});
+                % for val in prop.default:
+                    % if prop.ctype == "array[uint64]":
+        obj->${prop.name}[i++] = ${val}UL;
+                    % elif prop.ctype == "array[int64]":
+        obj->${prop.name}[i++] = ${val}LL;
+                    % else:
+        obj->${prop.name}[i++] = ${val};
+                    % endif
+                % endfor
+            % elif prop.ctype in ["array[object_path]", "array[string]", "array[signature]"]:
+        i = 0;
+        obj->${prop.name} = g_new0(gchar *, ${len(prop.default) + 1});
+                % for val in prop.default:
+        obj->${prop.name}[i++] = g_strdup("${val}");
+                % endfor
+            % endif
+        % endif
         if (flags) {
             ## 属性不存在时传入的value为空，需要开发者在回调函数中完成异常（有flags无属性值）处理
             ref_loaded(obj, &${properties}.${prop.name}, doc, NULL, user_data, flags);
@@ -311,13 +363,29 @@ static void _load_from_odf(yaml_document_t *doc, yaml_node_t *node, GclObject *g
 % endif
 }
 
+/**
+ * @brief 销毁对象
+ *
+ * @param gcl_obj 待销毁的对象句柄
+ */
+static void _${class_name}_destroy(GclObject *gcl_obj)
+{
+    g_assert(gcl_obj);
+    ${class_name} *obj = (${class_name} *)gcl_obj;
+    g_rec_mutex_clear(obj->_base.lock);
+    g_free(obj->_base.lock);
+    ${class_name}_clean(obj);
+    memset(obj, 0, sizeof(${class_name}));
+    g_free(obj);
+}
+
 /**
  * @brief 分配对象
  *
  * @param obj_name 对象名，需要由调用者分配内存
  * @param opaque 上层应用需要写入对象的用户数据，由上层应用使用
  */
-GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque)
+static GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque)
 {
     __attribute__((unused)) gint i = 0;
     ${class_name} *obj = g_new0(${class_name}, 1);

{lbkit-0.5.19 → lbkit-0.5.20}/lbkit/component/test.py

@@ -3,6 +3,7 @@ import shutil
 import re
 import os
 import imp
+import unittest
 from lbkit.component.build import BuildComponent
 from lbkit.component.arg_parser import ArgParser
 from lbkit import errors
@@ -109,7 +110,12 @@ class TestComponent():
             return 0
 
         log.success("call test method...")
-        test.test()
+        ret = test.test()
+        if ret is not None:
+            if isinstance(ret, unittest.TestResult) and (len(ret.errors) > 0 or len(ret.failures) > 0):
+                raise errors.TestException(f"Test failed, ret: {ret}")
+            elif isinstance(ret, int) and ret != 0:
+                raise errors.TestException(f"Test failed, ret: {ret}")
 
         test_src_folder = getattr(test, "test_src_folder", [])
         # 设置ROOTFS_DIR环境变量，为DT测试提供相对路径

{lbkit-0.5.19 → lbkit-0.5.20}/lbkit/errors.py

@@ -72,6 +72,8 @@ class HttpRequestException(Exception):
     def __str__(self):
         return super(HttpRequestException, self).__str__()
 
+class TestException(Exception):
+    pass
 
 class OdfValidateException(Exception):
     def __init__(self, *args, **kwargs):

{lbkit-0.5.19 → lbkit-0.5.20/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.5.19
+Version: 0.5.20
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

{lbkit-0.5.19 → lbkit-0.5.20}/test/test_codegen.py

@@ -221,6 +221,8 @@ class TestCodeGenClass(unittest.TestCase):
             IdfInterface(None, self.tmp_file)
 
     def test_validate_string(self):
+        self.mk_interface_with_string_property("string", "string", None, "as")
+        IdfInterface(None, self.tmp_file)
         self.mk_interface_with_string_property("string", "string", "^a[s]{1,2}$", "as")
         IdfInterface(None, self.tmp_file)
         self.mk_interface_with_string_property("string", "string", "^a[s]{1,2}$", "ass")
@@ -236,6 +238,8 @@ class TestCodeGenClass(unittest.TestCase):
             IdfInterface(None, self.tmp_file)
 
     def test_validate_array_string(self):
+        self.mk_interface_with_string_property("string", "array[string]", None, "[as, as]")
+        IdfInterface(None, self.tmp_file)
         self.mk_interface_with_string_property("string", "array[string]", "^a[s]{1,2}$", "[as, as]")
         IdfInterface(None, self.tmp_file)
         self.mk_interface_with_string_property("string", "array[string]", "^a[s]{1,2}$", "[ass, ass]")

lbkit-0.5.19/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.5.19'