diff --git a/packageship/packageship/application/apps/package/function/install_depend.py b/packageship/packageship/application/apps/package/function/install_depend.py index 8e5c1e7ecf7a665aa0818ddfd6a115ae673b29cb..69ea9150d8258e096610fcabdd1d5b779e862b73 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 92294feba490723560439ee2b4ff4f86292e50d6..ac0ec8e07690a86266076e1d0932a0fab6c8fb07 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 e837b5463219fdfc911407e54b8509b5e0d25130..38a8c2214efe9584ff323184d6a222d9d76bc64d 100644 --- a/packageship/pkgship.spec +++ b/packageship/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship -Version: 1.0 -Release: 5 +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 @@ -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.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 - 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 19dff752aa384ff80d21b7de6749ec86033e6566..7f04303df66f912f93620f7c370052b6e5ecae7a 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 0aeea894e6c09c747bd63cff7d5f7d62485ba16a..190b6f7fe6ade916373e89630fa61f1892ac102d 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: + 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: 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: + 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: 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 26f6760fc7e4aa0e07d8e8d3eed3d351225ce4ea..a567c73839d4fd2e5f55eb8454bdad8b40a4c452 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 de32263b90a0fe1c3d2ec0da1727b8d2d68ded75..dd8788c85043a955fe44a0ecdd3e9e85e8a0da31 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 8584ab40b06018e01d5303945d38659ea8b4ed62..395ff7e8c32c8e40b68ec0f0a7c4a5b2a996fb48 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 b816f2297720a3397abac8332dd1f09ee548721e..7fc68ab9d9d1cd517351f2478588e1f8858d17fa 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 06dfc9e075a1f384836f393049bfba121ebf7e28..b6b5c818808e118ead1f04fb3e848b21481548f8 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 815fbd358f663e7bdb20058d135ef309a0ca8c48..0bd84505c2b079bd8116fa76db45271593263102 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 b7b16a7f2309113ed67d4c624a26b83411fa4697..cc69ce695411e5949e805f051c6595bf0bb108eb 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 0143967501715db56f6ad82920ca6bd0985e3ba4..fead15d8a33f0db9ece1f1d5987e397926b9b0ac 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 Binary files a/packageship/test/common_files/dbs/openEuler-20.03-LTS.db and b/packageship/test/common_files/dbs/fedora30.db differ 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 Binary files a/packageship/test/common_files/dbs/openEuler-20.04-LTS.db and b/packageship/test/common_files/dbs/mainline.db differ diff --git a/packageship/test/common_files/operate_dbs/openEuler-20.03-LTS.db b/packageship/test/common_files/operate_dbs/fedora30.db similarity index 75% rename from packageship/test/common_files/operate_dbs/openEuler-20.03-LTS.db rename to packageship/test/common_files/operate_dbs/fedora30.db index 31056e94c6f82eacfaa940cc4d5ce473e7d439af..b7ca1a27484b467a27e96cd625658182a9784243 100644 Binary files a/packageship/test/common_files/operate_dbs/openEuler-20.03-LTS.db and b/packageship/test/common_files/operate_dbs/fedora30.db differ 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 Binary files a/packageship/test/common_files/operate_dbs/openEuler-20.04-LTS.db and b/packageship/test/common_files/operate_dbs/mainline.db differ diff --git a/packageship/test/common_files/operate_dbs/maintenance.information.db b/packageship/test/common_files/operate_dbs/maintenance.information.db index d43b5e4e10a2b922a2931664afe5cb6aba22852f..e654f0ee4db55657418c1bdb733b9911158e406a 100644 Binary files a/packageship/test/common_files/operate_dbs/maintenance.information.db and b/packageship/test/common_files/operate_dbs/maintenance.information.db differ diff --git a/packageship/test/common_files/package.ini b/packageship/test/common_files/package.ini index f7d029c88c4985b8e56190b6066c019cdb32fca5..b312707c18d932406a6043f8f56fa6688691b69b 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\14500\Desktop\workspace\openEuler_pkgmnt\openEuler_Advisor\packageship\test\common_files\conf.yaml +init_conf_path = debug = false write_port = 8080 query_port = 8090 @@ -7,10 +7,10 @@ write_ip_addr = 127.0.0.1 query_ip_addr = 127.0.0.1 [DATABASE] -user_name = root -password = 123456 -host = localhost -port = 3306 +user_name = +password = +host = +port = database = dbtype = sqlite @@ -19,6 +19,8 @@ log_level = INFO log_name = log_info.log [UWSGI] -daemonize = /var/run/pkgship/uwsgi.log +daemonize = /var/log/uwsgi.log buffer-size = 65536 +http-timeout = 600 +harakiri = 600 diff --git a/packageship/test/test_module/dependent_query_tests/test_be_depend.py b/packageship/test/test_module/dependent_query_tests/test_be_depend.py index 572412366b119f27a912666976a7f30dcef903df..fec663f76b73e23bacfdbf0a7cb2b9c7869bd8b9 100644 --- a/packageship/test/test_module/dependent_query_tests/test_be_depend.py +++ b/packageship/test/test_module/dependent_query_tests/test_be_depend.py @@ -8,13 +8,13 @@ import json from test.base_code.read_data_base import ReadTestBase from test.base_code.common_test_code import compare_two_values, get_correct_json_by_filename from packageship.application.apps.package.function.constants import ResponseCode - +from packageship.application.apps.package.function.searchdb import db_priority class TestBeDepend(ReadTestBase): """ The dependencies of the package are tested """ - + db_name = db_priority()[0] def test_lack_parameter(self): """ Less transmission is always parameter transmission @@ -98,7 +98,7 @@ class TestBeDepend(ReadTestBase): # Only the dbname resp = self.client.post("/packages/findBeDepend", data=json.dumps({ - "dbname": "openEuler-20.03-LTS", + "dbname": f"{self.db_name}", }), content_type="application/json") @@ -125,7 +125,7 @@ class TestBeDepend(ReadTestBase): resp = self.client.post("/packages/findBeDepend", data=json.dumps({ "packagename": "A", - "dbname": "openEuler-20.03-LTS" + "dbname": f"{self.db_name}" }), content_type="application/json") @@ -176,7 +176,7 @@ class TestBeDepend(ReadTestBase): # Don't preach packagename resp = self.client.post("/packages/findBeDepend", data=json.dumps({ - "dbname": "openEuler-20.03-LTS", + "dbname": f"{self.db_name}", "withsubpack": "0" }), content_type="application/json") @@ -204,7 +204,7 @@ class TestBeDepend(ReadTestBase): resp = self.client.post("/packages/findBeDepend", data=json.dumps({ "packagename": "A", - "dbname": "openEuler-20.03-LTS", + "dbname": f"{self.db_name}", "withsubpack": "0" }), content_type="application/json") @@ -230,7 +230,7 @@ class TestBeDepend(ReadTestBase): resp = self.client.post("/packages/findBeDepend", data=json.dumps({ "packagename": "A", - "dbname": "openEuler-20.03-LTS", + "dbname": f"{self.db_name}", "withsubpack": "1" }), content_type="application/json") @@ -261,7 +261,7 @@ class TestBeDepend(ReadTestBase): resp = self.client.post("/packages/findBeDepend", data=json.dumps({ "packagename": "詹姆斯", - "dbname": "openEuler-20.03-LTS", + "dbname": f"{self.db_name}", "withsubpack": "0" }), content_type="application/json") @@ -316,7 +316,7 @@ class TestBeDepend(ReadTestBase): resp = self.client.post("/packages/findBeDepend", data=json.dumps({ "packagename": "CUnit", - "dbname": "openEuler-20.03-LTS", + "dbname": f"{self.db_name}", "withsubpack": "3" }), content_type="application/json") diff --git a/packageship/test/test_module/dependent_query_tests/test_self_depend.py b/packageship/test/test_module/dependent_query_tests/test_self_depend.py index 4a2fcb5d1f794f88b8ed8ab45b279ed1df2acc43..f27967bbab213d928e214f96a08be59e980f2211 100644 --- a/packageship/test/test_module/dependent_query_tests/test_self_depend.py +++ b/packageship/test/test_module/dependent_query_tests/test_self_depend.py @@ -280,7 +280,10 @@ class TestSelfDepend(ReadTestBase): data=json.dumps(input_value), content_type="application/json") output_for_input = correct_data["output"] + from pprint import pprint + resp_dict = json.loads(resp.data) + self.assertTrue(compare_two_values(output_for_input, resp_dict), msg="The answer is not correct") diff --git a/packageship/test/test_module/repodatas_test/test_delete_repodatas.py b/packageship/test/test_module/repodatas_test/test_delete_repodatas.py index dc396272831db0d0522ad9a1f67e743bf1ab5145..3a229dd7a5179fabc3e2e04b4546b8fee139de4c 100644 --- a/packageship/test/test_module/repodatas_test/test_delete_repodatas.py +++ b/packageship/test/test_module/repodatas_test/test_delete_repodatas.py @@ -71,7 +71,7 @@ class TestDeleteRepodatas(OperateTestBase): try: shutil.copyfile(system_config.DATABASE_FILE_INFO, system_config.DATABASE_FILE_INFO + '.bak') shutil.copytree(system_config.DATABASE_FOLDER_PATH, system_config.DATABASE_FOLDER_PATH + '.bak') - resp = self.client.delete("/repodatas?dbName=openEuler-20.04-LTS") + resp = self.client.delete("/repodatas?dbName=fedora30") resp_dict = json.loads(resp.data) self.assertIn("code", resp_dict, msg="Error in data format return") diff --git a/packageship/test/test_module/single_package_tests/test_get_singlepack.py b/packageship/test/test_module/single_package_tests/test_get_singlepack.py index d4702987345a709267c3327c84ccd3bdcc33f258..e6f0eddbb2a008fee96f7ebc5aa845c5199686bf 100644 --- a/packageship/test/test_module/single_package_tests/test_get_singlepack.py +++ b/packageship/test/test_module/single_package_tests/test_get_singlepack.py @@ -10,19 +10,18 @@ import unittest import json from packageship.application.apps.package.function.constants import ResponseCode - - +from packageship.application.apps.package.function.searchdb import db_priority class TestGetSinglePack(ReadTestBase): """ Single package test case """ - + db_name = db_priority()[-1] def test_error_sourcename(self): """sourceName is none or err""" - resp = self.client.get("packages/findByPackName?dbName=openeuler-20.03-lts") + resp = self.client.get(f"packages/packageInfo?dbName={self.db_name}") resp_dict = json.loads(resp.data) - + self.assertIn("code", resp_dict, msg="Error in data format return") self.assertEqual(ResponseCode.PARAM_ERROR, resp_dict.get("code"), @@ -41,7 +40,7 @@ class TestGetSinglePack(ReadTestBase): msg="Error in data information return") resp = self.client.get( - "packages/findByPackName?sourceName=&dbName=openEuler-20.03-LTS") + f"packages/packageInfo?sourceName=&dbName={self.db_name}") resp_dict = json.loads(resp.data) self.assertIn("code", resp_dict, msg="Error in data format return") @@ -62,7 +61,7 @@ class TestGetSinglePack(ReadTestBase): msg="Error in data information return") resp = self.client.get( - "packages/findByPackName?sourceName=test&dbName=for") + "packages/packageInfo?sourceName=test&dbName=for") resp_dict = json.loads(resp.data) self.assertIn("code", resp_dict, msg="Error in data format return") @@ -85,7 +84,7 @@ class TestGetSinglePack(ReadTestBase): def test_true_dbname(self): """dbName is null or err""" - resp = self.client.get("packages/findByPackName?sourceName=A") + resp = self.client.get("packages/packageInfo?sourceName=A") resp_dict = json.loads(resp.data) self.assertIn("code", resp_dict, msg="Error in data format return") @@ -105,10 +104,10 @@ class TestGetSinglePack(ReadTestBase): correct_list = get_correct_json_by_filename("get_single_package") self.assertNotEqual([], correct_list, msg="Error reading JSON file") + input_value = correct_list[0]["url"] resp = self.client.get( - "/packages/findByPackName?sourceName=A&dbName=openEuler-20.03-LTS") + f"{input_value}") resp_dict = json.loads(resp.data) - self.assertIn("code", resp_dict, msg="Error in data format return") self.assertEqual(ResponseCode.SUCCESS, resp_dict.get("code"), @@ -123,13 +122,13 @@ class TestGetSinglePack(ReadTestBase): self.assertTrue( compare_two_values( resp_dict.get("data"), - correct_list), + correct_list[0]['data']), msg="Error in data information return") def test_wrong_dbname(self): """test_wrong_dbname""" resp = self.client.get( - "/packages/findByPackName?sourceName=CUnit&dbName=openEuler-20.03-lts") + "/packages/packageInfo?sourceName=A&dbName=open") resp_dict = json.loads(resp.data) self.assertIn("code", resp_dict, msg="Error in data format return") diff --git a/packageship/test/test_module/single_package_tests/test_update_singlepack.py b/packageship/test/test_module/single_package_tests/test_update_singlepack.py index 2b99c59af984012252dbec3b3ea19a9e2d92b9df..d6298b34372cd55f089d0f046f95c236115f344f 100644 --- a/packageship/test/test_module/single_package_tests/test_update_singlepack.py +++ b/packageship/test/test_module/single_package_tests/test_update_singlepack.py @@ -6,15 +6,15 @@ import unittest import json from packageship.application.apps.package.function.constants import ResponseCode - +from packageship.application.apps.package.function.searchdb import db_priority class TestUpdatePackage(OperateTestBase): """TestUpdatePackage""" - + db_name = db_priority()[0] def test_empty_dbname(self): """Parameter error""" - resp = self.client.put("/packages/findByPackName", + resp = self.client.put("/packages/packageInfo", data=json.dumps({"dbName": "", "sourceName": "xx", "maintainer": "", @@ -41,8 +41,8 @@ class TestUpdatePackage(OperateTestBase): msg="Error in data information return") # wrong dbname - resp = self.client.put("/packages/findByPackName", - data=json.dumps({"dbName": "xx", + resp = self.client.put("/packages/packageInfo", + data=json.dumps({"dbName": "xhhz", "sourceName": "xx", "maintainer": "", "maintainlevel": "1"}), @@ -70,8 +70,8 @@ class TestUpdatePackage(OperateTestBase): def test_empty_sourcename(self): """Parameter error""" - resp = self.client.put("/packages/findByPackName", - data=json.dumps({"dbName": "openEuler-20.04-LTS", + resp = self.client.put("/packages/packageInfo", + data=json.dumps({"dbName": f"{self.db_name}", "sourceName": "xx", "maintainer": "1"}), content_type="application/json") @@ -95,8 +95,8 @@ class TestUpdatePackage(OperateTestBase): resp_dict.get("data"), msg="Error in data information return") # miss maintainer maintainlevel - resp = self.client.put("/packages/findByPackName", - data=json.dumps({"dbName": "openEuler-20.04-LTS", + resp = self.client.put("/packages/packageInfo", + data=json.dumps({"dbName": f"{self.db_name}", "sourceName": "xx"}), content_type="application/json") resp_dict = json.loads(resp.data) @@ -123,8 +123,8 @@ class TestUpdatePackage(OperateTestBase): """ Returns: """ - resp = self.client.put("/packages/findByPackName", - data=json.dumps({"dbName": "openEuler-20.04-LTS", + resp = self.client.put("/packages/packageInfo", + data=json.dumps({"dbName": f"{self.db_name}", "sourceName": "A", "maintainer": "x", "maintainlevel": "1"}),