fixed some broken tests (fixed merge conflicts)

test/interface_stats/conftest.py

@@ -70,16 +70,27 @@ def all_nokia_routers():
     return NOKIA_ROUTERS
 
 
+"""
+@pelle: having a fixture that is used only in one place, and in a
+separate file from where it is used only decreases readability.
+Please move it ... or (to minimize ambiguity) use pytest.mark.parametrize
+(this and the one below)
+"""
 @pytest.fixture(params=JUNIPER_ROUTERS)
 def juniper_router_fqdn(request):
     return request.param
 
 
+@pytest.fixture(params=NOKIA_ROUTERS)
+def nokia_router_fqdn(request):
+    return request.param
+
 
 @pytest.fixture(params=NOKIA_ROUTERS)
 def nokia_router_fqdn(request):
     return request.param
 
+
 @pytest.fixture()
 def single_router_fqdn():
     return JUNIPER_ROUTERS[0]