From acce7692b2ed73404abc9477581be5c257ff5953 Mon Sep 17 00:00:00 2001 From: git user on spce Date: Thu, 4 Jul 2013 10:58:53 +0200 Subject: [PATCH] check.py: use proper "main" --- .gitignore | 3 ++- check.py | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 39c2d7e8..9692be5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *~ log -result \ No newline at end of file +result +*.pyc diff --git a/check.py b/check.py index b08e2597..d2502014 100755 --- a/check.py +++ b/check.py @@ -106,26 +106,27 @@ def check_sip_out(scen, msgs, test): else: test.error("sip_out[%d] does not exist" % i) -if(len(sys.argv)!=3): - print 'Usage: check.py scenario.yml test.yml' - sys.exit(1) - -with io.open(sys.argv[1], 'r') as file: - scen = load(file, Loader=Loader) -file.close() - -with io.open(sys.argv[2], 'r') as file: - check = load(file, Loader=Loader) -file.close() - -test = Test() - -test.comment('check flow') -check_flow(scen['flow'], check['flow'], test) -test.comment('check sip_in') -check_sip(scen['sip_in'], check['sip_in'], test) -test.comment('check sip_out') -check_sip_out(scen['sip_out'], check['sip_out'], test) -print test -if test.isError(): - sys.exit(1) +if __name__ == '__main__': + if(len(sys.argv)!=3): + print 'Usage: check.py scenario.yml test.yml' + sys.exit(1) + + with io.open(sys.argv[1], 'r') as file: + scen = load(file, Loader=Loader) + file.close() + + with io.open(sys.argv[2], 'r') as file: + check = load(file, Loader=Loader) + file.close() + + test = Test() + + test.comment('check flow') + check_flow(scen['flow'], check['flow'], test) + test.comment('check sip_in') + check_sip(scen['sip_in'], check['sip_in'], test) + test.comment('check sip_out') + check_sip_out(scen['sip_out'], check['sip_out'], test) + print test + if test.isError(): + sys.exit(1)