summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc/Testlib/TestServer
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-18 11:06:46 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-18 11:06:46 -0500
commit7161b78b261cdbd959bf6f42d0780ceb78bf2e64 (patch)
treeb619e1b222476096122e64302efc29c214076e9c /testsuite/Testsrc/Testlib/TestServer
parentb79027f553c82be75e49bcf9bde2f92ab72304c7 (diff)
parentc2133f115673670992048f3567c22e7478281a79 (diff)
downloadbcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.gz
bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.bz2
bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.zip
Merge branch '1.3.1' into 1.4.x
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer')
-rw-r--r--testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py
index 84d35ccc5..a7a6b3d6e 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py
@@ -22,13 +22,14 @@ 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, "0"]),
- ("1", [1], [0, 2]),
+ 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)