Merge branch '1.3.2' into maint

Conflicts:
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 0 insertions, 21 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py
index a7a6b3d6e..a9346156c 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py
@@ -18,27 +18,6 @@ from common import *
 from TestPlugin import TestXMLFileBacked, TestPlugin, TestConnector
 
 
-class TestPackedDigitRange(Bcfg2TestCase):
-    def test_includes(self):
-        # tuples of (range description, numbers that are included,
-        # numebrs that are excluded)
-        tests = [("1-3", [1, "2", 3], [4]),
-                 ("1", [1], [0, "2"]),
-                 ("10-11", [10, 11], [0, 1]),
-                 ("9-9", [9], [8, 10]),
-                 ("0-100", [0, 10, 99, 100], []),
-                 ("1,3,5", [1, 3, 5], [0, 2, 4, 6]),
-                 ("1-5,7", [1, 3, 5, 7], [0, 6, 8]),
-                 ("1-5,7,9-11", [1, 3, 5, 7, 9, 11], [0, 6, 8, 12]),
-                 ("852-855,321-497,763", [852, 855, 321, 400, 497, 763], [])]
-        for rng, inc, exc in tests:
-            r = PackedDigitRange(rng)
-            for test in inc:
-                self.assertTrue(r.includes(test))
-            for test in exc:
-                self.assertFalse(r.includes(test))
-
-
 class TestPatternMap(Bcfg2TestCase):
     def test_ranges(self):
         """ test processing NameRange patterns """