From 9c484801c016a5e41ae308462c432dbfde275675 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 27 May 2020 13:45:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/docker-compose.yml | 2 ++ unittest_python/unittest/con_traffic_inject.py | 3 ++- unittest_python/unittest/unittest_self.py | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index c96d264..616dc62 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -76,6 +76,8 @@ services: ifconfig eth0 hw ether 02:42:C0:A8:FD:03 arp -i eth0 -s 192.0.2.130 02:42:c0:a8:fd:82 arp -i eth0 -s 192.0.2.131 02:42:C0:A8:FD:83 + mkdir -p /root/result_self_test/unittest + mkdir -p /root/result_self_test/con_traffic_inject cp -rf /root/cafile_dict/certs/sets/current/gen/crt/ca-root.crt /usr/local/share/ca-certificates update-ca-certificates cat /root/unittest/badssl.test.hosts >> /etc/hosts diff --git a/unittest_python/unittest/con_traffic_inject.py b/unittest_python/unittest/con_traffic_inject.py index 9a85669..59aea93 100644 --- a/unittest_python/unittest/con_traffic_inject.py +++ b/unittest_python/unittest/con_traffic_inject.py @@ -95,6 +95,7 @@ if __name__ == '__main__': while True: ssl = SSLBuild() ssl.ssl_intercept() - with open("/root/result_self_test/result_con_traffic_inject.txt","w+") as f: + logpath = "/root/result_self_test/con_traffic_inject/con_traffic_inject_result.log." + time.strftime("%Y-%m-%d",time.localtime()) + with open(logpath,"w+") as f: f.write(json.dumps(ssl.resultlist, sort_keys=True, indent=4, separators=(',', ': '))) time.sleep(1) diff --git a/unittest_python/unittest/unittest_self.py b/unittest_python/unittest/unittest_self.py index 3757311..2efddb7 100644 --- a/unittest_python/unittest/unittest_self.py +++ b/unittest_python/unittest/unittest_self.py @@ -385,11 +385,12 @@ if __name__ == '__main__': suite.addTest(SslUnitTest('test_http_replace')) suite.addTest(SslUnitTest('test_http_hijack')) suite.addTest(SslUnitTest('test_http_insert')) - with open("/root/result_self_test/unittest_result.txt","w+") as f: - runner = unittest.TextTestRunner(stream=f,verbosity=2) - while 1: + while True: + logpath = "/root/result_self_test/unittest/unittest_result.log." + time.strftime("%Y-%m-%d",time.localtime()) + with open(logpath,"w+") as f: + runner = unittest.TextTestRunner(stream=f,verbosity=2) f.write("Test start time: ") f.write(time.asctime(time.localtime(time.time()))) f.write("\n") runner.run(suite) - time.sleep(1) + time.sleep(1)