diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:05:37 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:05:37 -0500 |
| commit | 84b9fabb4895b38eeddefdcc417301e8ae1befc4 (patch) | |
| tree | a409a3e9ac6eac1f30f562a8cae27e4571807032 /testsuite/Testsrc/Testlib/TestServer/TestPlugins | |
| parent | 661d1f6d2789e855eff4fca38e6f4a0a564da728 (diff) | |
| parent | 3d78a3a1c00035c9d8c49b949b63e8f05f31c7a1 (diff) | |
| download | bcfg2-84b9fabb4895b38eeddefdcc417301e8ae1befc4.tar.gz bcfg2-84b9fabb4895b38eeddefdcc417301e8ae1befc4.tar.bz2 bcfg2-84b9fabb4895b38eeddefdcc417301e8ae1befc4.zip | |
Merge branch 'master' into 1.3.1
Conflicts:
src/lib/Bcfg2/Server/Plugins/Properties.py
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestGroupPatterns.py | 5 |
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) |