New subject: Change in vdsm[master]: py3: make some of network/tc_test pass

Friday, 2 September 2016

Dan Kenigsberg has uploaded a new change for review.

Change subject: py3: make network/tc_test pass
......................................................................

py3: make network/tc_test pass

Change-Id: I544446358e611a0507aad7d7df4ab6c57ad5bdf0
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M tests/Makefile.am
M tests/network/tc_test.py
2 files changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/63198/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2dce548..7243e50 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -201,7 +201,6 @@
 	network/ovs_driver_test.py \
 	network/ovs_info_test.py \
 	network/ovs_test.py \
-	network/tc_test.py \
 	network/unified_persistence_test.py \
 	numaUtilsTests.py \
 	outOfProcessTests.py \
diff --git a/tests/network/tc_test.py b/tests/network/tc_test.py
index 7ac30c0..12bd17e 100644
--- a/tests/network/tc_test.py
+++ b/tests/network/tc_test.py
@@ -25,14 +25,14 @@
 import os
 import sys
 from binascii import unhexlify
-from itertools import izip_longest
 from subprocess import Popen, PIPE
 
 from nose.plugins.attrib import attr
 
 import six
+from six.moves import zip_longest
 
-from hostdevTests import Connection
+from vmfakecon import Connection
 from testlib import (VdsmTestCase as TestCaseBase, permutations,
                      expandPermutations)
 from testValidation import ValidateRunningAsRoot, stresstest
@@ -170,8 +170,8 @@
         with open(path) as tc_filter_show:
             data = tc_filter_show.read()
 
-        for parsed, correct in izip_longest(tc._filters(None, out=data),
-                                            filters):
+        for parsed, correct in zip_longest(tc._filters(None, out=data),
+                                           filters):
             self.assertEqual(parsed, correct)
 
     def test_qdiscs(self):
@@ -220,8 +220,8 @@
                           'target': 5000.0, 'interval': 150000.0,
                           'ecn': True}},
         )
-        for parsed, correct in izip_longest(tc.qdiscs(None, out=data),
-                                            qdiscs):
+        for parsed, correct in zip_longest(tc.qdiscs(None, out=data),
+                                           qdiscs):
             self.assertEqual(parsed, correct)
 
     def test_classes(self):
@@ -265,8 +265,8 @@
              'leaf': '5000:', 'hfsc': {'ls':
{'m1': 0, 'd': 0,
                                               'm2': reported_ls_5000}}},
         )
-        for parsed, correct in izip_longest(tc.classes(None, out=data),
-                                            classes):
+        for parsed, correct in zip_longest(tc.classes(None, out=data),
+                                           classes):
             self.assertEqual(parsed, correct)
 
 


-- 
To view, visit https://gerrit.ovirt.org/63198
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I544446358e611a0507aad7d7df4ab6c57ad5bdf0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
    

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Change in vdsm[master]: py3: make network/tc_test pass