From 97e639a7603fc073c0686e31f074f8880260b189 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Wed, 8 Dec 2021 16:19:19 +0800 Subject: [PATCH] Format adjustment --- tests/get_catalog.py | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/tests/get_catalog.py b/tests/get_catalog.py index 16544ed997..e1449ed78d 100644 --- a/tests/get_catalog.py +++ b/tests/get_catalog.py @@ -1,6 +1,6 @@ #!/usr/bin/python ################################################################### -# Copyright (c) 2016 by TAOS Technologies, Inc. +# Copyright (c) 2016 by TAOS Technologies, Inc. # All rights reserved. # # This file is proprietary and confidential to TAOS Technologies. @@ -21,7 +21,7 @@ sys.path.append("pytest") import importlib class CatalogGen: - def __init__(self,CaseDirList,CatalogName,DirDepth): + def __init__(self, CaseDirList, CatalogName, DirDepth): self.CaseDirList = CaseDirList self.CatalogName = CatalogName self.blacklist = [] @@ -32,17 +32,18 @@ class CatalogGen: self.GetCatalog(i) self.CollectLog(i) print('Catalog Generation done') - def CollectLog(self,CaseDir): + + def CollectLog(self, CaseDir): DirorFiles = os.listdir(CaseDir) for loop in range(self.DirDepth): for i in DirorFiles: - fileName = os.path.join(CaseDir,i) + fileName = os.path.join(CaseDir, i) if os.path.isdir(fileName): self.CollectLog(fileName) else: if i == self.CatalogName and fileName not in self.blacklist: self.blacklist.append(fileName) - with open(fileName,"r") as f : + with open(fileName, "r") as f : Catalog = f.read() title = CaseDir.split("/")[-1] TitleLevel = CaseDir.count("/") @@ -50,20 +51,18 @@ class CatalogGen: f.write("#" * TitleLevel + ' %s\n' % title) f.write(Catalog) - - - def GetCatalog(self,CaseDir): - for root,dirs,files in os.walk(CaseDir): + def GetCatalog(self, CaseDir): + for root, dirs, files in os.walk(CaseDir): for file in files: if file.endswith(".py"): - fileName = os.path.join(root,file) + fileName = os.path.join(root, file) moduleName = fileName.replace(".py", "").replace("/", ".") uModule = importlib.import_module(moduleName) title = file.split('.')[0] TitleLevel = root.count('/') + 1 try: ucase = uModule.TDTestCase() - with open(root + '/' + self.CatalogName,'a') as f: + with open(root + '/' + self.CatalogName, 'a') as f: f.write('#'*TitleLevel + ' %s\n' % title) for i in ucase.caseDescription.__doc__.split('\n'): if i.lstrip() == '':continue @@ -73,7 +72,7 @@ class CatalogGen: def CleanCatalog(self): for i in self.CaseDirList: - for root,dirs,files in os.walk(i): + for root, dirs, files in os.walk(i): for file in files: if file == self.CatalogName: os.remove(root + '/' + self.CatalogName) @@ -90,8 +89,8 @@ if __name__ == "__main__": if key in ['-h', '--help']: print( 'A collection of test cases catalog written using Python') - print("-d root dir of test case files written by Python,default: system-test,develop-test") - print('-c catalog file name,default: catalog.md') + print("-d root dir of test case files written by Python, default: system-test,develop-test") + print('-c catalog file name, default: catalog.md') print('-v dir depth of test cases.default: 5') print('-n generate') print('-r delete') @@ -118,20 +117,16 @@ if __name__ == "__main__": elif (value.upper() == "FALSE"): delete = False - - - # CatalogName = 'catalog.md' - # CaseDirList = ['system-test','develop-test'] - print(CaseDirList,CatalogName) + print(CaseDirList, CatalogName) if CaseDirList == [] : - CaseDirList = ['system-test','develop-test'] + CaseDirList = ['system-test', 'develop-test'] if CatalogName == '' : CatalogName = 'catalog.md' if DirDepth == 0: DirDepth = 5 print('opt:\n\tcatalogname: %s\n\tcasedirlist: %s\n\tdepth: %d\n\tgenerate: %s\n\tdelete: %s' - % (CatalogName,','.join(CaseDirList),DirDepth,generate,delete)) - f = CatalogGen(CaseDirList,CatalogName,DirDepth) + % (CatalogName, ','.join(CaseDirList), DirDepth, generate, delete)) + f = CatalogGen(CaseDirList, CatalogName, DirDepth) if delete: f.CleanCatalog() if generate: -- GitLab