fixed inline tests

samples/sqlite.sql

@@ -13,10 +13,7 @@ hello world
 20
 */
 
-CREATE TABLE LePoop AS -- > SELECT "hai" || ! => hai!
+CREATE TABLE LePoop AS -- > SELECT "hai" || "!"; => hai!
   SELECT 20 AS burd,    10 AS duck,     5 AS goose UNION
   SELECT 12,            2,              3         UNION
   SELECT 31,            34,             0;
-
--- >>> SELECT burd FROM LePoop WHERE goose > 2 LIMIT 1;
--- 20

uniexpect/configs/scheme.py

@@ -21,7 +21,7 @@
         'inline_comments': False
     },
     {
-        'input_prefix': '; > ',
+        'input_prefix': '> ',
         'output_prefix': '=>',
         'one-liner': True,
         'block_comments': True,

uniexpect/expect.py

@@ -41,9 +41,8 @@ def extract_comments(code, settings):
         # extract all inline comments
         inlines = []
         for start in settings.inline_comments:
-            start = re.escape(start)
             inline = re.compile('{}[^\n]+'.format(start))
-            inlines.extend(inline.findall(code))
+            inlines.extend([line[len(start):] for line in inline.findall(code)])
             decommented_code = inline.sub('', decommented_code)
 
         return blocks, inlines, decommented_code
@@ -95,8 +94,10 @@ def extract_tests(*args):
             inline = inline.strip()
             for test in inline_tests:
                 if inline.startswith(test['input_prefix']):
+                    inline_body = inline[len(test['input_prefix']):]
                     suites.append(
-                        [split(inline, test['output_prefix']) + [test]])
+                        [split(inline_body, test['output_prefix']) + [test]])
+                    break
         return suites, code
 
     @staticmethod

uniexpect/main.py

@@ -49,7 +49,7 @@ def main():
         if not correct or args.verbose:
             print(test_output.format(**output))
     if length == passed:
-        print('\nAll passed!\n')
+        print('\nAll passed! (%d/%d)\n' % (passed, length))
     else:
         print('\nPassed', passed, 'of', length, 'tests.\n')
     print(hbar)