Rename speed.py to speedtest.py and make test_speed() more robust

cryzed · Feb 2, 2020 · 77ad97c · 77ad97c
1 parent b7e1120
commit 77ad97c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/traffictoll/cli.py b/traffictoll/cli.py
@@ -9,7 +9,7 @@
 from ruamel.yaml import YAML
 
 from .net import ProcessFilterPredicate, filter_net_connections
-from .speed import test_speed
+from .speedtest import test_speed
 from .tc import (
     MAX_RATE,
     INGRESS_QDISC_PARENT_ID,

diff --git a/traffictoll/speed.py → traffictoll/speedtest.py b/traffictoll/speed.py → traffictoll/speedtest.py
@@ -2,7 +2,8 @@
 import subprocess
 from typing import Tuple, Optional
 
-from traffictoll.utils import run
+from .exceptions import DependencyError
+from .utils import run
 
 
 # https://www.speedtest.net/apps/cli
@@ -30,9 +31,12 @@ def _sivel_speedtest_cli() -> Optional[Tuple[int, int]]:
 
 
 def test_speed() -> Optional[Tuple[int, int]]:
-    process = run(
-        "speedtest --version", stdout=subprocess.PIPE, universal_newlines=True
-    )
+    try:
+        process = run(
+            "speedtest --version", stdout=subprocess.PIPE, universal_newlines=True
+        )
+    except DependencyError:
+        return
 
     lines = process.stdout.splitlines()
     if not lines: