From 927685880ed3cf7cb09ee82628da316e86600418 Mon Sep 17 00:00:00 2001 From: zt <1450026690@qq.com> Date: Wed, 12 Aug 2020 15:52:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9test=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=92=8C=E5=9B=9E=E6=98=BE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/package/function/install_depend.py | 2 +- packageship/packageship/libs/log/loghelper.py | 2 +- packageship/pkgship.spec | 12 +- .../test/base_code/init_config_path.py | 4 +- packageship/test/common_files/conf.yaml | 16 +- .../correct_test_result_json/be_depend.json | 240 +++++++++--------- .../build_depend.json | 12 +- .../get_repodatas.json | 21 +- .../get_single_package.json | 45 ++-- .../install_depend.json | 20 +- .../correct_test_result_json/packages.json | 20 +- .../correct_test_result_json/self_depend.json | 158 ++++++------ .../test/common_files/database_file_info.yaml | 4 +- .../{openEuler-20.03-LTS.db => fedora30.db} | Bin 20480 -> 24576 bytes .../{openEuler-20.04-LTS.db => mainline.db} | Bin 20480 -> 24576 bytes .../{openEuler-20.03-LTS.db => fedora30.db} | Bin 20480 -> 24576 bytes .../{openEuler-20.04-LTS.db => mainline.db} | Bin 20480 -> 24576 bytes .../operate_dbs/maintenance.information.db | Bin 8192 -> 8192 bytes packageship/test/common_files/package.ini | 14 +- .../dependent_query_tests/test_be_depend.py | 18 +- .../dependent_query_tests/test_self_depend.py | 3 + .../repodatas_test/test_delete_repodatas.py | 2 +- .../test_get_singlepack.py | 23 +- .../test_update_singlepack.py | 22 +- 24 files changed, 337 insertions(+), 301 deletions(-) rename packageship/test/common_files/dbs/{openEuler-20.03-LTS.db => fedora30.db} (75%) rename packageship/test/common_files/dbs/{openEuler-20.04-LTS.db => mainline.db} (75%) rename packageship/test/common_files/operate_dbs/{openEuler-20.03-LTS.db => fedora30.db} (75%) rename packageship/test/common_files/operate_dbs/{openEuler-20.04-LTS.db => mainline.db} (75%) diff --git a/packageship/packageship/application/apps/package/function/install_depend.py b/packageship/packageship/application/apps/package/function/install_depend.py index 8e5c1e7e..69ea9150 100644 --- a/packageship/packageship/application/apps/package/function/install_depend.py +++ b/packageship/packageship/application/apps/package/function/install_depend.py @@ -75,7 +75,7 @@ class InstallDepend(): response_code: response code Raises: """ - result_list = self.__search_db.get_install_depend(self.__search_list) + result_list = set(self.__search_db.get_install_depend(self.__search_list)) for search in self.__search_list: if search not in self.binary_dict.dictionary: self.binary_dict.init_key(key=search, parent_node=[]) diff --git a/packageship/packageship/libs/log/loghelper.py b/packageship/packageship/libs/log/loghelper.py index 92294feb..ac0ec8e0 100644 --- a/packageship/packageship/libs/log/loghelper.py +++ b/packageship/packageship/libs/log/loghelper.py @@ -64,7 +64,7 @@ class Log(): if path: self.__path = os.path.join(LOG_FOLDER_PATH, path) else: - self.__path = READCONFIG.get_system('log_path') + self.__path = READCONFIG.get_config('LOG', 'log_path') if not self.__path: self.__path = os.path.join(LOG_FOLDER_PATH, log_name) else: diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec index e837b546..d8780cf8 100644 --- a/packageship/pkgship.spec +++ b/packageship/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship Version: 1.0 -Release: 5 +Release: 5.1 Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so no. License: Mulan 2.0 URL: https://gitee.com/openeuler/openEuler-Advisor @@ -8,6 +8,8 @@ Source0: https://gitee.com/openeuler/openEuler-Advisor/pkgship-%{version} BuildArch: noarch +BuildRequires: python3-flask-restful python3-flask python3 python3-pyyaml python3-sqlalchemy +BuildRequires: python3-prettytable python3-requests python3-flask-session python3-flask-script python3-marshmallow Requires: python3-pip python3-flask-restful python3-flask python3 python3-pyyaml Requires: python3-sqlalchemy python3-prettytable python3-requests Requires: python3-pyinstaller python3-flask-session python3-flask-script python3-marshmallow python3-uWSGI @@ -26,7 +28,11 @@ Pkgship implements rpm package dependence ,maintainer, patch query and so no. %check +# change log_path to solve default log_path permission denied problem +log_path=`pwd`/tmp/ +sed -i "/\[LOG\]/a\log_path=$log_path" test/common_files/package.ini %{__python3} -m unittest test/run_tests.py +rm -rf $log_path %post #build cli bin @@ -61,6 +67,10 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %changelog + +* Wed Aug 12 2020 Zhang Tao - 1.0-5.1 +- Fix the test content to adapt to the new data structure, add BuildRequires for running %check + * Mon Aug 10 2020 Zhengtang Gong - 1.0-5 - Command line supports calling remote services diff --git a/packageship/test/base_code/init_config_path.py b/packageship/test/base_code/init_config_path.py index 19dff752..7f04303d 100644 --- a/packageship/test/base_code/init_config_path.py +++ b/packageship/test/base_code/init_config_path.py @@ -34,8 +34,8 @@ class InitConf: "data_{}_src.sqlite".format(str(index))) bin_path = os.path.join(base_path, "db_origin", "data_{}_bin.sqlite".format(str(index))) - obj["src_db_file"] = [src_path] - obj["bin_db_file"] = [bin_path] + obj["src_db_file"] = src_path + obj["bin_db_file"] = bin_path with open(conf_path, 'w', encoding='utf-8') as w_f: yaml.dump(origin_yaml, w_f) diff --git a/packageship/test/common_files/conf.yaml b/packageship/test/common_files/conf.yaml index 0aeea894..a7e61753 100644 --- a/packageship/test/common_files/conf.yaml +++ b/packageship/test/common_files/conf.yaml @@ -1,14 +1,10 @@ -- bin_db_file: - - C:\Users\14500\Desktop\workspace\openEuler_pkgmnt\openEuler_Advisor\packageship\test\common_files\db_origin\data_1_bin.sqlite - dbname: openEuler-20.03-LTS +- bin_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_1_bin.sqlite + dbname: mainline priority: 1 - src_db_file: - - C:\Users\14500\Desktop\workspace\openEuler_pkgmnt\openEuler_Advisor\packageship\test\common_files\db_origin\data_1_src.sqlite + src_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_1_src.sqlite status: enable -- bin_db_file: - - C:\Users\14500\Desktop\workspace\openEuler_pkgmnt\openEuler_Advisor\packageship\test\common_files\db_origin\data_2_bin.sqlite - dbname: openEuler-20.04-LTS +- bin_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_2_bin.sqlite + dbname: fedora30 priority: 2 - src_db_file: - - C:\Users\14500\Desktop\workspace\openEuler_pkgmnt\openEuler_Advisor\packageship\test\common_files\db_origin\data_2_src.sqlite + src_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_2_src.sqlite status: enable diff --git a/packageship/test/common_files/correct_test_result_json/be_depend.json b/packageship/test/common_files/correct_test_result_json/be_depend.json index 26f6760f..a567c738 100644 --- a/packageship/test/common_files/correct_test_result_json/be_depend.json +++ b/packageship/test/common_files/correct_test_result_json/be_depend.json @@ -1,131 +1,131 @@ [ { - "input": { - "packagename": "A", - "dbname":"openEuler-20.03-LTS" - }, - "output": { - "code": "2001", - "data": { - "A1": [ - "A", - "0.0.23b", - "openEuler-20.03-LTS", - [ - [ - "B", - "build" - ], - [ - "D", - "build" - ], - [ - "D1", - "install" - ], - [ - "B1", - "install" - ] - ] - ], - "A2": [ - "A", - "0.0.23b", - "openEuler-20.03-LTS", - [ - [ - "C", - "build" - ], - [ - "C1", - "install" - ], - [ - "A1", - "install" - ] - ] - ], - "A_src": [ - "source", - "0.0.23b", - "openEuler-20.03-LTS", - [ - [ - "root", - null - ] - ] - ], - "B1": [ - "B", - "0.0.2", - "openEuler-20.03-LTS", - [ - [ + "input": { + "packagename": "A", + "dbname": "mainline" + }, + "output": { + "code": "2001", + "data": { + "A1": [ "A", - "build" + "0.0.23b", + "mainline", + [ + [ + "B", + "build" + ], + [ + "D", + "build" + ], + [ + "D1", + "install" + ], + [ + "B1", + "install" + ] + ] ], - [ - "D", - "build" - ] - ] - ], - "B2": [ - "B", - "0.0.2", - "openEuler-20.03-LTS", - [ - [ - "C", - "build" - ] - ] - ], - "C1": [ - "C", - "0.1", - "openEuler-20.03-LTS", - [ - [ + "A2": [ "A", - "build" + "0.0.23b", + "mainline", + [ + [ + "C", + "build" + ], + [ + "C1", + "install" + ], + [ + "A1", + "install" + ] + ] ], - [ + "A_src": [ + "source", + "0.0.23b", + "mainline", + [ + [ + "root", + null + ] + ] + ], + "B1": [ "B", - "build" + "0.0.2", + "mainline", + [ + [ + "A", + "build" + ], + [ + "D", + "build" + ] + ] ], - [ - "A2", - "install" + "B2": [ + "B", + "0.0.2", + "mainline", + [ + [ + "C", + "build" + ] + ] ], - [ - "B2", - "install" - ] - ] - ], - "D1": [ - "D", - "0.11", - "openEuler-20.03-LTS", - [ - [ - "D2", - "install" + "C1": [ + "C", + "0.1", + "mainline", + [ + [ + "A", + "build" + ], + [ + "B", + "build" + ], + [ + "A2", + "install" + ], + [ + "B2", + "install" + ] + ] ], - [ - "A2", - "install" + "D1": [ + "D", + "0.11", + "mainline", + [ + [ + "D2", + "install" + ], + [ + "A2", + "install" + ] + ] ] - ] - ] - }, - "msg": "Successful Operation!" -}} -] - + }, + "msg": "Successful Operation!" + } + } +] \ No newline at end of file diff --git a/packageship/test/common_files/correct_test_result_json/build_depend.json b/packageship/test/common_files/correct_test_result_json/build_depend.json index de32263b..dd8788c8 100644 --- a/packageship/test/common_files/correct_test_result_json/build_depend.json +++ b/packageship/test/common_files/correct_test_result_json/build_depend.json @@ -9,7 +9,7 @@ "A_src": [ "source", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -20,7 +20,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -31,7 +31,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -46,7 +46,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "B1", @@ -61,7 +61,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "A1", @@ -76,7 +76,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", diff --git a/packageship/test/common_files/correct_test_result_json/get_repodatas.json b/packageship/test/common_files/correct_test_result_json/get_repodatas.json index 8584ab40..395ff7e8 100644 --- a/packageship/test/common_files/correct_test_result_json/get_repodatas.json +++ b/packageship/test/common_files/correct_test_result_json/get_repodatas.json @@ -1,9 +1,12 @@ -[{ - "database_name": "openEuler-20.03-LTS", - "priority": 1, - "status": "enable" -}, { - "database_name": "openEuler-20.04-LTS", - "priority": 2, - "status": "enable" -}] \ No newline at end of file +[ + { + "database_name": "mainline", + "priority": 1, + "status": "enable" + }, + { + "database_name": "fedora30", + "priority": 2, + "status": "enable" + } +] \ No newline at end of file diff --git a/packageship/test/common_files/correct_test_result_json/get_single_package.json b/packageship/test/common_files/correct_test_result_json/get_single_package.json index b816f229..7fc68ab9 100644 --- a/packageship/test/common_files/correct_test_result_json/get_single_package.json +++ b/packageship/test/common_files/correct_test_result_json/get_single_package.json @@ -1,15 +1,30 @@ -[{ - "buildDep": ["B1", "C1"], - "dbname": "openEuler-20.03-LTS", - "downloadURL": null, - "license": "GPLv2+ and BSD and MIT and IBM", - "maintainer": null, - "maintainlevel": null, - "sourceName": "A", - "sourceURL": "http://play0ad.com", - "subpack": { - "A1": ["A2"], - "A2": ["C1", "D1"] - }, - "version": "0.0.23b" -}] \ No newline at end of file +[ + { + "url": "/packages/packageInfo?sourceName=A&dbName=mainline", + "data": [ + { + "buildDep": [ + "B1", + "C1" + ], + "dbname": "mainline", + "license": "GPLv2+ and BSD and MIT and IBM", + "maintainer": null, + "maintainlevel": null, + "rpm_packager": "Fedora Project", + "sourceName": "A", + "sourceURL": "http://play0ad.com", + "subpack": { + "A1": [ + "A2" + ], + "A2": [ + "C1", + "D1" + ] + }, + "version": "0.0.23b" + } + ] + } +] \ No newline at end of file diff --git a/packageship/test/common_files/correct_test_result_json/install_depend.json b/packageship/test/common_files/correct_test_result_json/install_depend.json index 06dfc9e0..b6b5c818 100644 --- a/packageship/test/common_files/correct_test_result_json/install_depend.json +++ b/packageship/test/common_files/correct_test_result_json/install_depend.json @@ -9,7 +9,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -24,7 +24,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "A1", @@ -39,7 +39,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -50,7 +50,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -72,7 +72,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "D1", @@ -83,7 +83,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "A1", @@ -98,7 +98,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -109,7 +109,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "D2", @@ -124,7 +124,7 @@ "D2": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -146,7 +146,7 @@ "C2": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "root", diff --git a/packageship/test/common_files/correct_test_result_json/packages.json b/packageship/test/common_files/correct_test_result_json/packages.json index 815fbd35..0bd84505 100644 --- a/packageship/test/common_files/correct_test_result_json/packages.json +++ b/packageship/test/common_files/correct_test_result_json/packages.json @@ -1,5 +1,5 @@ [{ - "dbname": "openEuler-20.03-LTS", + "dbname": "mainline", "downloadURL": null, "license": "GPLv2+ and BSD and MIT and IBM", "maintainer": null, @@ -8,7 +8,7 @@ "sourceURL": "http://play0ad.com", "version": "0.0.23b" }, { - "dbname": "openEuler-20.03-LTS", + "dbname": "mainline", "downloadURL": null, "license": null, "maintainer": null, @@ -17,7 +17,7 @@ "sourceURL": null, "version": "0.0.2" }, { - "dbname": "openEuler-20.03-LTS", + "dbname": "mainline", "downloadURL": null, "license": null, "maintainer": null, @@ -26,7 +26,7 @@ "sourceURL": null, "version": "0.1" }, { - "dbname": "openEuler-20.03-LTS", + "dbname": "mainline", "downloadURL": null, "license": null, "maintainer": null, @@ -35,7 +35,7 @@ "sourceURL": null, "version": "0.11" }, { - "dbname": "openEuler-20.04-LTS", + "dbname": "fedora30", "downloadURL": null, "license": "GPLv2+ and BSD and MIT and IBM", "maintainer": null, @@ -44,7 +44,7 @@ "sourceURL": "http://play0ad.com", "version": "0.0.23b" }, { - "dbname": "openEuler-20.04-LTS", + "dbname": "fedora30", "downloadURL": null, "license": null, "maintainer": null, @@ -53,7 +53,7 @@ "sourceURL": null, "version": "0.0.3" }, { - "dbname": "openEuler-20.04-LTS", + "dbname": "fedora30", "downloadURL": null, "license": null, "maintainer": null, @@ -62,7 +62,7 @@ "sourceURL": null, "version": "0.1" }, { - "dbname": "openEuler-20.04-LTS", + "dbname": "fedora30", "downloadURL": null, "license": null, "maintainer": null, @@ -71,7 +71,7 @@ "sourceURL": null, "version": "0.12" }, { - "dbname": "openEuler-20.04-LTS", + "dbname": "fedora30", "downloadURL": null, "license": null, "maintainer": null, @@ -80,7 +80,7 @@ "sourceURL": null, "version": "0.4" }, { - "dbname": "openEuler-20.04-LTS", + "dbname": "fedora30", "downloadURL": null, "license": null, "maintainer": null, diff --git a/packageship/test/common_files/correct_test_result_json/self_depend.json b/packageship/test/common_files/correct_test_result_json/self_depend.json index b7b16a7f..cc69ce69 100644 --- a/packageship/test/common_files/correct_test_result_json/self_depend.json +++ b/packageship/test/common_files/correct_test_result_json/self_depend.json @@ -10,7 +10,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -33,7 +33,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "A1", @@ -52,7 +52,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -67,7 +67,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -78,7 +78,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -97,7 +97,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -108,15 +108,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], + "B": [ + "mainline", + "0.0.2" + ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } @@ -136,7 +140,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "D1", @@ -155,7 +159,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "C1", @@ -174,7 +178,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -189,7 +193,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -200,7 +204,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -223,7 +227,7 @@ "C2": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -234,7 +238,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -245,15 +249,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], + "B": [ + "mainline", + "0.0.2" + ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } @@ -274,7 +282,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "D1", @@ -293,7 +301,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -316,7 +324,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -331,7 +339,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -342,7 +350,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -361,7 +369,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -376,7 +384,7 @@ "C2": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -387,7 +395,7 @@ "D2": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "D", @@ -398,19 +406,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], "B": [ - "openEuler-20.03-LTS", + "mainline", "0.0.2" ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } @@ -432,7 +440,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -455,7 +463,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -478,7 +486,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -493,7 +501,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -504,7 +512,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -523,7 +531,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -538,7 +546,7 @@ "C2": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -549,7 +557,7 @@ "D2": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "D", @@ -560,19 +568,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], "B": [ - "openEuler-20.03-LTS", + "mainline", "0.0.2" ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } @@ -594,7 +602,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -621,7 +629,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -644,7 +652,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -659,7 +667,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -670,7 +678,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -693,7 +701,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -708,7 +716,7 @@ "C2": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -719,7 +727,7 @@ "D2": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "D", @@ -730,19 +738,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], "B": [ - "openEuler-20.03-LTS", + "mainline", "0.0.2" ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } @@ -763,7 +771,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "D1", @@ -786,7 +794,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -809,7 +817,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -824,7 +832,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -835,7 +843,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -858,7 +866,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -869,19 +877,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], "B": [ - "openEuler-20.03-LTS", + "mainline", "0.0.2" ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } @@ -903,7 +911,7 @@ "A1": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -930,7 +938,7 @@ "A2": [ "A", "0.0.23b", - "openEuler-20.03-LTS", + "mainline", [ [ "root", @@ -953,7 +961,7 @@ "B1": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "A", @@ -968,7 +976,7 @@ "B2": [ "B", "0.0.2", - "openEuler-20.03-LTS", + "mainline", [ [ "C", @@ -979,7 +987,7 @@ "C1": [ "C", "0.1", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -1002,7 +1010,7 @@ "D1": [ "D", "0.11", - "openEuler-20.03-LTS", + "mainline", [ [ "A2", @@ -1013,19 +1021,19 @@ }, "source_dicts": { "A": [ - "openEuler-20.03-LTS", + "mainline", "0.0.23b" ], "B": [ - "openEuler-20.03-LTS", + "mainline", "0.0.2" ], "C": [ - "openEuler-20.03-LTS", + "mainline", "0.1" ], "D": [ - "openEuler-20.03-LTS", + "mainline", "0.11" ] } diff --git a/packageship/test/common_files/database_file_info.yaml b/packageship/test/common_files/database_file_info.yaml index 01439675..fead15d8 100644 --- a/packageship/test/common_files/database_file_info.yaml +++ b/packageship/test/common_files/database_file_info.yaml @@ -1,6 +1,6 @@ -- database_name: openEuler-20.03-LTS +- database_name: mainline priority: 1 status: enable -- database_name: openEuler-20.04-LTS +- database_name: fedora30 priority: 2 status: enable diff --git a/packageship/test/common_files/dbs/openEuler-20.03-LTS.db b/packageship/test/common_files/dbs/fedora30.db similarity index 75% rename from packageship/test/common_files/dbs/openEuler-20.03-LTS.db rename to packageship/test/common_files/dbs/fedora30.db index 31056e94c6f82eacfaa940cc4d5ce473e7d439af..2d6c77f9da54228843d3026dd79df0a5ad219588 100644 GIT binary patch literal 24576 zcmeHNO>84c74~luw=?uaBNUCoKq<>;6No$hNhS=^2--i%TALX{CbQ9KR~yRRWxGiK znCiBJ2RHy?5CQ~<3tA3HAcVA+6(Bexfdm}(fZ)Ii4qSlMB5~os-r!Yrx807Nh{Fs* zs9MT&*Q@IHUVT-s$KTg||D*fVC#dZ*8~dn|xSB{N6CXw>kw_@;HwS;wk%fy))PQp` zc74&MlF({DzXHA4x!)xg-^l%T;r01n!lgVU0ulj%eDh}V^UwIW zWsw$jPI}B8P?LD^>$%!tLqBSuBfYxcK=B^5rsSxJn)i+xdyPYM?;}U(-h=)94W#58 zY!mc?epq`>KU^ypi|gFjws6OrvXY)_bf>HX!aV9aBl~vfgAt2hZ`${2@3iwg8Lmdz z@OTG@&Aa;HL-c&(AzGv6y0ZScbS9W`Q%u=o#t9>z=u<|#_;q$-%JH86^(psQ92$Z8 zEELjl6!?-xD8#Qb6DY)c{x48?oKDRz-?)+d^271=$HuAH;BZb)&Ata#KJ)WiZDQl| z&ZfCKwQna1BHGND#ddyVylCf7)=4z_d_6>VuW#F!4X5&e;x-uV`Lk-P&#bBOKDEh7 zn_47ZSi;!qQ)^WGyxdsNKC!4loLG5A>F~Y*aZHy@Mc`c>=JtCtdqkA3>-jT#J-5#c z0v=}eb_q5KJMnzX{CN62V%P^Mo$ukxj5}mHQI9?%Ct+{=CSj)zgt06#;ZF4MMW%xZ z{4CeNd<9OrjI^gxAN98454s3Rqf3laSlttU*c;b+)XSe$Gq>8rQy|*G@I-w4-lV94 zudIxohTbQVV$oQXCK{Q%cfvf`fp%GPqjj7{fhdQw;E`>iJ zfA3=cv5Nesx%9tNKLF1(<| zn1c*DpcZ{3^cimh-uN1Qk2)O$S~S07NH92T5&w)32La(kRjsBe7<44w5MUj_IKb=U z#1MIRX{T!q5w=?tM4vu5rOv>$2HY!%Mm{OH?E?5NaG9!7S2_&$y3~MiCh;*yZzh7C zGnbuiAOP1fHxLg8pj+gV6qI|>?73%zwfh!=e0|q0aN*2X1h~ZM02S60g(oH~UCieI z6QB+R0V3@7Y`*BNAvy+CuML8@*bp9CJKo&`85yHMq645H^}gd1!Zwty+iDGAO#-K( zBLE!oq_9;G$TKCa>-)VAZf^3mC}LAHT>GV)Z~x|{n}7b!-ogH${C<&r^?qHP?>3Lb zxmmrtOF%8e=pX=6xBDL9IeMFXr+Pvc9N2)FJ=iIfD;ivAZE;Hoz2>sc(zl*{d(uzx zudlhux4!Qr-+Fc7AW-_e&Eh6xRw!yk4N9aCJU=uj8V!^}uZzpuw>baLDc?+7Ni6%PwG|QK2K>OS6au;%{kWZFdvQVdjg#A*k>8yU)XSmYqE;$}e7Fv-OO$Wil(<&#d1`rMA=Q^oxn> zYDu5SZ6q}4=z#<5{Rqf4r@OlhxEp7({7Y(7tBFn_AXq?>fm8E;kv9Y?Zi^wDs>6*y zKuw!EKs5;qnm~YA-+@=W9n|L$e2Cz2I$KkkK4;(JJ2q6~mq4g(o9h4=foMPtF__=k z20?>=hk-5X578O*yKz=Mz>E^G1LpHsT`pW$)H&r+1^3T21n%uwP$fc84A&$YLQP+R4&jH|Jz(|i39tm=5gRhkqC`7OWIz)4b zzxnd;L;Eie^Pk!e1c6X6;9?T#TZC~U|G@Ej#Gq{o48P?S_!c6pP%Lg;v}3Qmx!#-Q zDDjJrCI9u$RPN0Y`4=k*1zqA#$CBofk`_MU#`Iqo@Bh_LC)B^Ie^7s={zUz*`ZZ|E zLn0s%kO)WwBmxoviGV~vA|Mfv2uK7Z0uq5Iguv2#F0sUYC70{%grv-+6(~z2Liy= zNB|hI{W$+`jre~~{c1w}hx!-w4fS>PXX=mDAE>W@NgfgbiGV~vA|Mfv2uK7Z0ulj< zfJ8tdAQ6xVJPic$xrOk90NtF=FGP)cE3M3jja(h)=c0}pPUW*vqiST7Of;&B^XaHV QH!}IuxRK2#M~znc-xngPO8@`> literal 20480 zcmeI2L5Sm27{}jB(x!Pc?b~5l23!`yTy_SRZl}W@^rA_V9gA&uHq%|0gDfvi#IT*T zrk#;J$qaj3?;?2fum?drcoDoPc=Dnk;za}xf+sJ6N5A(nX{j>`v+U}@??HI~@Be)- z?f2v5@IrQPcamvrzcI@8#nj#+7YL=~7276+RNyMXRSW}!yox~!@egx_)L;Ig3I)cp zNoqgW*z)%va3BFBfCP{L5eZ|CcyB7gVLTRt`}fA#=rD=m z$wE+S1-{ew?Y`r7e0w2fuQMx&>~^p3Z~KAWyVbXQcRHPGHnUQ(AKQ1Gp!KQ~tlwxf zHl(>0CTZKdA3s1fI6+nwwUjS9O=Vf#lXOm=<&h|pH*bB3^&b1e2tNtDa z?1ks3YV4t@8Y@s0v$oJ!;XbX#hRGmKCueN_$><;(#CL+u+G!Zk=`N2Rw&Q^EBr;mf9JpQ zANjZZEB+b(n19IMP4)=F3hyXc&^=nWw6>zYpg0YCE#mpIrp7GMYEQqwg_m(@{(3)>deZu7nTjH za#9kOEK^EiIl^FNC233OC05F-LF>%OeNSj6({mrRVQHW(LS3O-R7&_SLX+oz#vc>@ z2YdnW3%mjNj(^R+gm(a+fQbVMAOR$R1dsp{Kmter2_OL^fCP{L68KjMn9P8KzZaRN tC51aEnH4D<5T+EZ&@juYCe+Q6N`WwxfHwiUsu5aQ17UfhOy%r~KLHise-;1$ diff --git a/packageship/test/common_files/dbs/openEuler-20.04-LTS.db b/packageship/test/common_files/dbs/mainline.db similarity index 75% rename from packageship/test/common_files/dbs/openEuler-20.04-LTS.db rename to packageship/test/common_files/dbs/mainline.db index 1a8981105b6c6d0dd13db4365af338521a3f0d95..a96d22a6301a92698fa34d0e3fa5dfca78d11245 100644 GIT binary patch literal 24576 zcmeHNOKc=Z8SZ)6o*u7yEelyIV^nfj#a2A+nelp;M2TP?UNee!W4zv2E25a1?wXm3 z`!Q74jG2WOuYE)q}N4skAPPZ3lOPDJ$vuR(HxeAS|H1H?nU>F&J?O4yI$T_D(v_li_Nd zjTmqLpn0cy@Blr(^8l?;dtG1uVkR3-xhba{Fzc9+PxmP!LGn5`G3BJ^e|^e5mV`#4 zejW;$Bno0lV-%9t*$EVqp7#X`k22}mrInS`*B^|xKekTf28VNIYW6*_ikY9?Y7-k@ zIGgtB)V`f4hirZqe$Iq*+K69qpbLx`g zHg!m{u%xlor_QMOMY*w_d+bn)c!~0i(-FP_@ob+>jUZed=J$K&dgLfwKj7zj1HaEK z0uj#jb_uo#I}SKzJej^2G4er5XFXz>afeJN8qkO2IPxYtNjvpm7{?(K;iN|_G966d z=lB*DD{$Opq&=1T$lFRj=wc+TF0oEvb&vV5H?H;AE1p&7ZncT0K)i$DiTLQlDOm;I zSROqQ#S}#xaZXQEL2P|IRS^HTFi{1u@x4_++*(zEssi|-5m$kWsmHNLy+jq4qaP5V zk9rOnkn!U#_Fhybf}3Xxzt!fyHorH26)x1F5Kssx1QY@a0fm4%|9G(&_bVHhZMOWXe-VH4d@Wih|Uc z9|XmH2Xpa86CE7hL%Tw;_1mcGS(JDj9bwkSjFeE-Y?x>blwr^Bdlm>Bs}BkD5g8V3 zLRQxi4G>0cM#u*8d&Db-n#=~WodNAD3_z?T^ewoQ455YVNs|fHiFih#Dd)1VHk;b;RP);@J|B-gAYMRM%+iB z5C{!m`!0Q!a$-KL?({+XjyDbW$PalF(Z{Rxv5fwxuPKtiJ z2(gPorrK)g9fo^dYC$`ja17F$jlgs2vy%-3;Cl8362k%L4*3iPU%(EP88*jzHCGgCH(9M1a7-{XX^4ZZ8PT0>ZqFlZDA0Eav&Y!w9ZOxf&m-g{;Y^+ot8aFI|84 zH!ofP^LKam_Xd@xWcIat4SBxPJe22V?apliY9U7ZA&^zK9}tmauqk$GAa%ik3z)fs zTgA$j2^VHtc8Q=jeb!m{_LJ{U#!3D4M}F#^?|Z3temJ)uDt*CbX%jLlmQ1L!tyVFt zGZTu&1f?+O;>z|-!T;y`5(`>=a&m_6<#Yez@QF=fI>hapb$_9C|!N z17HNA0kvdf(X$PLhWHKxJCqO6DdpWHs~%uR3D|-20{3J(yi*2-jV%%Yl^&%oc{Tz* zjU}0f=nic$@#)Pekoc|;E*$Ee2&qEE7aD?y_9Unh5h#{#6BD5(*TEs&_}u`ARO}6aR5V!83q!~@rbSqdWMZTM&dJ)K#DEc zwuM090ec5YfMEyOwB0652m|A}gBC&bXgFI&jn^Su0wGN>_*Myqg=8VYzQco91hB+f znV~`iJD@{MkMPZxhacU0d06=DUML7ef`Jf|NZ%n$5c&IF&?6RYQ(*Y5peVKwVZ~DE z#zi}J@$L2Ad4aTFd@A*?f28wokI27VNq9Dt&8=dkZ2F{ZMh~Jf{jUoCpEq9AjK3Lw zG=63L#CYBKrtvw0f=L|;0fm4y)5Kssx1QY@a0fm40zfMw?PCF;fg{sc0I0Vj9-kBdB2!WTh?Ik*01%q4#sUDaeM_?aB>!)X z_`hy^UNin~{Kfc#@uu-J;|=2n#&?X@z^D#|fI>hapb$_9Cy)5Kssx z1Re_l1${31QlMea7V_~;6{ibx@lB(Z(PyKZd;=F|Vn@A|E#yWw&?Ot+)U2GIiM!Nr QAssuaR<4j5-Lx|Q2F^>IZ2$lO literal 20480 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 literal 20480 zcmeI2L5Sm27{}jB(x!Pc?b~5l23!`yTy_SRZl}W@^rA_V9gA&uHq%|0gDfvi#IT*T zrk#;J$qaj3?;?2fum?drcoDoPc=Dnk;za}xf+sJ6N5A(nX{j>`v+U}@??HI~@Be)- z?f2v5@IrQPcamvrzcI@8#nj#+7YL=~7276+RNyMXRSW}!yox~!@egx_)L;Ig3I)cp zNoqgW*z)%va3BFBfCP{L5eZ|CcyB7gVLTRt`}fA#=rD=m z$wE+S1-{ew?Y`r7e0w2fuQMx&>~^p3Z~KAWyVbXQcRHPGHnUQ(AKQ1Gp!KQ~tlwxf zHl(>0CTZKdA3s1fI6+nwwUjS9O=Vf#lXOm=<&h|pH*bB3^&b1e2tNtDa z?1ks3YV4t@8Y@s0v$oJ!;XbX#hRGmKCueN_$><;(#CL+u+G!Zk=`N2Rw&Q^EBr;mf9JpQ zANjZZEB+b(n19IMP4)=F3hyXc&^=nWw6>zYpg0YCE#mpIrp7GMYEQqwg_m(@{(3)>deZu7nTjH za#9kOEK^EiIl^FNC233OC05F-LF>%OeNSj6({mrRVQHW(LS3O-R7&_SLX+oz#vc>@ z2YdnW3%mjNj(^R+gm(a+fQbVMAOR$R1dsp{Kmter2_OL^fCP{L68KjMn9P8KzZaRN tC51aEnH4D<5T+EZ&@juYCe+Q6N`WwxfHwiUsu5aQ17UfhOy%r~KLHise-;1$ diff --git a/packageship/test/common_files/operate_dbs/openEuler-20.04-LTS.db b/packageship/test/common_files/operate_dbs/mainline.db similarity index 75% rename from packageship/test/common_files/operate_dbs/openEuler-20.04-LTS.db rename to packageship/test/common_files/operate_dbs/mainline.db index 1a8981105b6c6d0dd13db4365af338521a3f0d95..0e31b354171dd7c05cf72766679c9f127588bd8c 100644 GIT binary patch literal 24576 zcmeI2OKc=Z8OM8G_Dqjgy_SWnl`$$gtYRyk_RM&_OQJ+D53d=;yK%hUSR104n(msJ ziu*BC_lz?Ok$8wjJR&$EE|EY8i3^GloRNY=a>xP5g~t_$a^S*&NF3m+>c{kWY!jhH zLZMpnPWM+`Uw!rK`g;5Oci(w-m-+;CTxMe*Z7P?QR7&|2LW-gk;co{1qAdqI+2{a% zQ;Gfac8iMMc;gbZ=4Ree=6+ZBZT{`qU%{^2Bmqf45|9KWfrn1uOa0vJ;?=9EuRP-8 zwnf_1IqEZaNKN7;_h%aW+qHvjbWp4BZlh!iT2%|wM6KHg+dJF)==L)Q==R;+-F2iE z9BdQxTy4Mc>DvBkwOn4~#*T%%-jtQ}U86T;9TMhI*NN?0p$|qZg1u?qEB)i{(`2*~ zMZ?G2+i%^f?cYOBZ{I_!)Lc{7zMRPhQ*MbVd(1du4jOs(6AgoqY1W{H&_8P8k!lX()IeL5c^yEm|H%tljjKyn+5_WiSRYrw3j^L=WQ zqYkx5GO>iQJ)l;c{5;)Q-#)UaL7YT-M&ab3JP1_o_3O+QeNTTETEfeDLv< z$bxSz#dkzLMec|HrYEu>vOb(Fi2hrc$b!iD!LlGaTV{dG0(j7fvcSgF@v%dlL>5=V z2Z*4JIu;p{@$D{ZJugiz&3!}3=AT#c&(H17T`vCSp+AgChmwFKAPGnUl7J-ee?;KH zAoVe&qAe_GSMb;8E7@#ot#t2FI=z<7W)GDsnpT1&csHZ^J%R#N|Z)GlWwOJoW^lx3=N()z@D#o!q74K=)+C)^b zj#xWKG^u^{mDDm{1>mpsHN2C}E^R%s_Eb8(mC0m211e>uHWAy{A-d~;+IIkA9GAy# zGSGUs^2NWTMvaDO6oR7#q8ey${9ojaK)SQVDO}ovjv!c>Hg!OnA}lxr!Hf+Yc*WaA z13rQeBY0f?YN#!rt99Z#Hq_v|Ai&u+*9|cOk&znWWZts_0x16u16$M|p%d!&k}BK~ zGfKb?8X0I+OoeyKpvYl^cp$ySp$lCOf&PYt_y^uC+GhOIn-dWIdR*wVsB_GvP41s- zj@;X$pkjtl4A&$&LM>l~2H}U=eNX{A6R?Cp#)IbFxaK-A`~iHo7Kn%OgfRj=wTC?7 zL)kwQ5E@d+KRtbiMU?ISP<$IB6Xz**L2Z}PRfG*J;;%~e-`sD75qvGdx0|7A< z7`gaN1{Psl_`B$f=OLpN z3K--j2}lBxfFvLZNCJ|8Bp?Y$0+N6vAPGnU{{exd0MHJL_OSra#Gz>{05sZR9iJ2c zLQ_%z2$h4R01%iiM*;v;`-Z6Yll6Z)uK!i-i;DI)?a$ipwYRljXg}3{qEmrH+f~sG(-$imCXZo%t8-ke!$S literal 20480 zcmeI2Ply{;9LL|AKbg#AlV6uo7A(cbUb>4VO|tE!J=94uy9SeVolOgSS|*t(j?GTe zNp__dWtZYj@an;vHwCYvcoIE%Q4sMWf(OBq7r~>yH`$pGcNJC(3jIA8-uL_az2A`E zhnK^9%+4$Aa2kjQqj=w&iVb#wan4>8f-#oIN5>}}8VdQOgQwze<~%Fk`M!t?v?YU; zekxf@-=UyE1c(3;AOb{y2oM1xKm>@ue@Wn|qZun#ukz#Fsn;I{V{h-cFz$#yWV!hLQ1SzX6TDnx94m*uIS$FiSE62`rOE0uK_ zTufr%(``6A0^hYK ze@#+jtshs^q@O3x&-;mkM+aei(obr%)BU8WbNAy18vh*N~7mxbQr{wa1>>Gp_cB2tgUnHg{v-mzIN>S!(|#;KHVlr*%L65FhltF@wy>h)ykT<;Ty9k{WXnKpqrbJ?KCHbUyvP^zon|t3TD@d$)jO|Fr{i1KuaAe`>Y5g-CYfCvx)B0vO)01+SpPnAI4 z)Y&qy&1$ufM|FucYk1zTE*aABW>p%kkVAKoH)KjJ=re<ewN Date: Tue, 18 Aug 2020 10:44:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9spec=E6=96=87=E4=BB=B6Rel?= =?UTF-8?q?ease=E4=B8=8D=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98,=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6windows=E8=B7=AF=E5=BE=84=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageship/pkgship.spec | 6 +++--- packageship/test/common_files/conf.yaml | 8 ++++---- packageship/test/common_files/package.ini | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec index d8780cf8..38a8c221 100644 --- a/packageship/pkgship.spec +++ b/packageship/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship -Version: 1.0 -Release: 5.1 +Version: 1.0.0 +Release: 6 Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so no. License: Mulan 2.0 URL: https://gitee.com/openeuler/openEuler-Advisor @@ -68,7 +68,7 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %changelog -* Wed Aug 12 2020 Zhang Tao - 1.0-5.1 +* Wed Aug 12 2020 Zhang Tao - 1.0.0-6 - Fix the test content to adapt to the new data structure, add BuildRequires for running %check * Mon Aug 10 2020 Zhengtang Gong - 1.0-5 diff --git a/packageship/test/common_files/conf.yaml b/packageship/test/common_files/conf.yaml index a7e61753..190b6f7f 100644 --- a/packageship/test/common_files/conf.yaml +++ b/packageship/test/common_files/conf.yaml @@ -1,10 +1,10 @@ -- bin_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_1_bin.sqlite +- bin_db_file: dbname: mainline priority: 1 - src_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_1_src.sqlite + src_db_file: status: enable -- bin_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_2_bin.sqlite +- bin_db_file: dbname: fedora30 priority: 2 - src_db_file: C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\db_origin\data_2_src.sqlite + src_db_file: status: enable diff --git a/packageship/test/common_files/package.ini b/packageship/test/common_files/package.ini index 3dc5095c..b312707c 100644 --- a/packageship/test/common_files/package.ini +++ b/packageship/test/common_files/package.ini @@ -1,5 +1,5 @@ [SYSTEM] -init_conf_path = C:\Users\TAO\Desktop\yiru-euler\openEuler-Advisor\packageship\test\common_files\conf.yaml +init_conf_path = debug = false write_port = 8080 query_port = 8090 -- Gitee