tests: blacken re-format

Signed-off-by: Christian Hopps <chopps@labn.net>

diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py
index 4224b037b058a1d9ded717c57e5dcf8fe0e7d56d..70ef7d4a633a2dfa0a067f3873b0f725ee947897 100755 (executable)
--- a/tests/topotests/conftest.py
+++ b/tests/topotests/conftest.py
@@ -12,18 +12,18 @@ import subprocess
 import sys
 import time
 
-import pytest
-
 import lib.fixtures
-from lib import topolog
+import pytest
 from lib.micronet_compat import Mininet
 from lib.topogen import diagnose_env, get_topogen
 from lib.topolog import logger
 from lib.topotest import g_extra_config as topotest_extra_config
 from lib.topotest import json_cmp_result
+from munet import cli
 from munet.base import Commander, proc_error
 from munet.cleanup import cleanup_current, cleanup_previous
-from munet import cli
+
+from lib import topolog
 
 
 def pytest_addoption(parser):

diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index 7843063165dfecf2417efb41d8d5970097b661c7..888012585d998b6486a131f14f3919f08c138b20 100644 (file)
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -25,6 +25,7 @@ Basic usage instructions:
 * After running stop Mininet with: tgen.stop_topology()
 """
 
+import configparser
 import grp
 import inspect
 import json
@@ -38,11 +39,6 @@ import subprocess
 import sys
 from collections import OrderedDict
 
-if sys.version_info[0] > 2:
-    import configparser
-else:
-    import ConfigParser as configparser
-
 import lib.topolog as topolog
 from lib.micronet import Commander
 from lib.micronet_compat import Mininet