From dd199c4389add25b7c2274d81dae3fb5457e64af Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
Date: Sat, 18 May 2013 21:08:33 -0400
Subject: [PATCH] Fix tokenizer tests with setup.py test.

---
 tests/_test_tokenizer.py        | 11 ++++++-----
 tests/tokenizer/comments.mwtest |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/_test_tokenizer.py b/tests/_test_tokenizer.py
index d9badba..382a9bf 100644
--- a/tests/_test_tokenizer.py
+++ b/tests/_test_tokenizer.py
@@ -58,7 +58,7 @@ class TokenizerTestCase(object):
         return inner
 
     @classmethod
-    def _load_tests(cls, filename, text):
+    def _load_tests(cls, filename, name, text):
         """Load all tests in *text* from the file *filename*."""
         tests = text.split("\n---\n")
         counter = 1
@@ -100,7 +100,7 @@ class TokenizerTestCase(object):
                 print(error.format(data["name"], filename))
                 continue
             number = str(counter).zfill(digits)
-            fname = "test_{0}{1}_{2}".format(filename, number, data["name"])
+            fname = "test_{0}{1}_{2}".format(name, number, data["name"])
             meth = cls._build_test_method(fname, data)
             setattr(cls, fname, meth)
             counter += 1
@@ -113,12 +113,13 @@ class TokenizerTestCase(object):
                 text = fp.read()
                 if not py3k:
                     text = text.decode("utf8")
-                cls._load_tests(filename[:0-len(extension)], text)
+                name = path.split(filename)[1][:0-len(extension)]
+                cls._load_tests(filename, name, text)
 
         directory = path.join(path.dirname(__file__), "tokenizer")
         extension = ".mwtest"
-        if len(sys.argv) > 1:  # Read specific tests from command line
-            for name in sys.argv[1:]:
+        if len(sys.argv) > 2 and sys.argv[1] == "--use":
+            for name in sys.argv[2:]:
                 load_file(path.join(directory, name + extension))
             sys.argv = [sys.argv[0]]  # So unittest doesn't try to load these
             cls.skip_others = True
diff --git a/tests/tokenizer/comments.mwtest b/tests/tokenizer/comments.mwtest
index 0d7c0fa..ea2e89f 100644
--- a/tests/tokenizer/comments.mwtest
+++ b/tests/tokenizer/comments.mwtest
@@ -35,5 +35,5 @@ output: [Text(text="<!-- foo")]
 
 name:   incomplete_partial_close
 label:  a comment that doesn't close, with a partial close
-input:  "<!-- foo --\x00>"
-output: [Text(text="<!-- foo --\x00>")]
+input:  "<!-- foo --\x01>"
+output: [Text(text="<!-- foo --\x01>")]