From d7c5ed50c2fa8864da012b881ca06205142416b4 Mon Sep 17 00:00:00 2001 From: Kkevsterrr Date: Fri, 13 Mar 2020 08:42:03 -0400 Subject: [PATCH] Migrated remaining os.system to sp.check_call --- tests/test_engine.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/test_engine.py b/tests/test_engine.py index f9f8e73..ed44185 100644 --- a/tests/test_engine.py +++ b/tests/test_engine.py @@ -8,6 +8,7 @@ sys.path.append(BASEPATH) import engine + def test_engine(): """ Basic engine test @@ -35,7 +36,7 @@ def test_engine_sleep(): # Create the engine in debug mode with engine.Engine(port, strategy, log_level="info") as eng: - os.system("curl -s http://example.com") + sp.check_call("curl -s http://example.com", shell=True) # Strategy to use in opposite direction strategy = "\/ [TCP:flags:SA]-sleep{1}-|" @@ -45,7 +46,6 @@ def test_engine_sleep(): sp.check_call("curl -s http://example.com", shell=True) - def test_engine_trace(): """ Basic engine test with trace @@ -57,7 +57,11 @@ def test_engine_trace(): # Create the engine in debug mode with engine.Engine(port, strategy, log_level="debug") as eng: - os.system("curl -m 5 http://example.com?q=ultrasurf") + try: + sp.check_call("curl -m 5 http://example.com", shell=True) + except sp.CalledProcessError as exc: + print("Expecting timeout exception") + print(exc) def test_engine_drop(): @@ -71,5 +75,8 @@ def test_engine_drop(): # Create the engine in debug mode with engine.Engine(port, strategy, log_level="debug") as eng: - os.system("curl -m 3 http://example.com?q=ultrasurf") - + try: + sp.check_call("curl -m 3 http://example.com") + except sp.CalledProcessError as exc: + print("Expecting timeout exception") + print(exc)