Merge pull request #123 from fniessink/fix-unittests

Fix unittests on Python 3.6.
bw2 · Jan 13, 2019 · 206fd8a · 206fd8a
2 parents a821c8e + 9367822
commit 206fd8a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py
@@ -233,8 +233,8 @@ def testBasicCase2(self, use_groups=False):
 
         if not use_groups:
             self.assertRegex(self.format_help(),
-                'usage: .* \[-h\] --genome GENOME \[-v\] -g MY_CFG_FILE'
-                ' \[-d DBSNP\]\s+\[-f FRMT\]\s+vcf \[vcf ...\]\n\n' +
+                'usage: .* \[-h\] --genome GENOME \[-v\] -g MY_CFG_FILE\n?'
+                '\s+\[-d DBSNP\]\s+\[-f FRMT\]\s+vcf \[vcf ...\]\n\n' +
                 9*'(.+\s+)'+  # repeated 8 times because .+ matches atmost 1 line
                 'positional arguments:\n'
                 '  vcf \s+ Variant file\(s\)\n\n'
@@ -247,8 +247,8 @@ def testBasicCase2(self, use_groups=False):
                 '  -f FRMT, --format FRMT\s+\[env var: OUTPUT_FORMAT\]\n')
         else:
             self.assertRegex(self.format_help(),
-                'usage: .* \[-h\] --genome GENOME \[-v\] -g MY_CFG_FILE'
-                ' \[-d DBSNP\]\s+\[-f FRMT\]\s+vcf \[vcf ...\]\n\n'+
+                'usage: .* \[-h\] --genome GENOME \[-v\] -g MY_CFG_FILE\n?'
+                '\s+\[-d DBSNP\]\s+\[-f FRMT\]\s+vcf \[vcf ...\]\n\n'+
                 9*'.+\s+'+  # repeated 8 times because .+ matches atmost 1 line
                 'positional arguments:\n'
                 '  vcf \s+ Variant file\(s\)\n\n'