selftest: enable py3 for samba.tests.kcc.graph
authorJoe Guo <joeg@catalyst.net.nz>
Tue, 3 Apr 2018 23:29:41 +0000 (11:29 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 5 Apr 2018 06:59:10 +0000 (08:59 +0200)
In Python 3, range() will not return a list any more.
So `range(7) * 4` will not work.
Convert range to list to fix.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
python/samba/tests/kcc/graph.py
selftest/tests.py

index dec861a9de579baad4239148a44836559e94cd05..31db853a40fb7fb5cd7045dd6189c71db18d11a6 100644 (file)
@@ -53,8 +53,8 @@ class GraphFunctionTests(samba.tests.TestCase):
                 ([0xff] * 84, 84 * 8),
                 ([0xaa] * 84, 84 * 4),
                 ([0x03, 0x33] * 42, 42 * 6),
-                (range(7) * 12, 12 * 9),
-                (range(4) * 21, 21 * 4)):
+                (list(range(7)) * 12, 12 * 9),
+                (list(range(4)) * 21, 21 * 4)):
             self.assertEquals(total_schedule(schedule), total)
 
     def test_convert_schedule_to_repltimes(self):
@@ -63,7 +63,7 @@ class GraphFunctionTests(samba.tests.TestCase):
                 (None, [0x11] * 84),
                 ([0x06] * 168, [0x66] * 84),
                 ([0x03, 0xa] * 84, [0x3a] * 84),
-                (range(7) * 24,
+                (list(range(7)) * 24,
                  [0x01, 0x23, 0x45, 0x60, 0x12, 0x34, 0x56] * 12)):
             schedule = ntdsconn_schedule(ntdsconn_times)
             self.assertEquals(convert_schedule_to_repltimes(schedule),
index c0c4bbc63bb61ad6580d7af37b74e97399735820..227857c70eb90905a2c9183b4a9ee877851a3864 100644 (file)
@@ -148,8 +148,8 @@ plantestsuite(
 planpythontestsuite("none", "samba.tests.upgradeprovision", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.xattr", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.ntacls", py3_compatible=True)
-planpythontestsuite("none", "samba.tests.policy",  py3_compatible=True)
-planpythontestsuite("none", "samba.tests.kcc.graph")
+planpythontestsuite("none", "samba.tests.policy", py3_compatible=True)
+planpythontestsuite("none", "samba.tests.kcc.graph", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.kcc.graph_utils")
 planpythontestsuite("none", "samba.tests.kcc.ldif_import_export")
 planpythontestsuite("none", "samba.tests.graph")