Index: pyyaml/trunk/tests/test_mark.py
===================================================================
--- pyyaml/trunk/tests/test_mark.py	(revision 120)
+++ pyyaml/trunk/tests/test_mark.py	(revision 322)
@@ -1,34 +1,32 @@
 
-import test_appliance
+import yaml
 
-from yaml.reader import Mark
+def test_marks(marks_filename, verbose=False):
+    inputs = open(marks_filename, 'rb').read().split('---\n')[1:]
+    for input in inputs:
+        index = 0
+        line = 0
+        column = 0
+        while input[index] != '*':
+            if input[index] == '\n':
+                line += 1
+                column = 0
+            else:
+                column += 1
+            index += 1
+        mark = yaml.Mark(marks_filename, index, line, column, unicode(input), index)
+        snippet = mark.get_snippet(indent=2, max_length=79)
+        if verbose:
+            print snippet
+        assert isinstance(snippet, str), type(snippet)
+        assert snippet.count('\n') == 1, snippet.count('\n')
+        data, pointer = snippet.split('\n')
+        assert len(data) < 82, len(data)
+        assert data[len(pointer)-1] == '*', data[len(pointer)-1]
 
-class TestMark(test_appliance.TestAppliance):
+test_marks.unittest = ['.marks']
 
-    def _testMarks(self, test_name, marks_filename):
-        inputs = file(marks_filename, 'rb').read().split('---\n')[1:]
-        for input in inputs:
-            index = 0
-            line = 0
-            column = 0
-            while input[index] != '*':
-                if input[index] == '\n':
-                    line += 1
-                    column = 0
-                else:
-                    column += 1
-                index += 1
-            mark = Mark(test_name, index, line, column, unicode(input), index)
-            snippet = mark.get_snippet(indent=2, max_length=79)
-            #print "INPUT:"
-            #print input
-            #print "SNIPPET:"
-            #print snippet
-            self.failUnless(isinstance(snippet, str))
-            self.failUnlessEqual(snippet.count('\n'), 1)
-            data, pointer = snippet.split('\n')
-            self.failUnless(len(data) < 82)
-            self.failUnlessEqual(data[len(pointer)-1], '*')
+if __name__ == '__main__':
+    import test_appliance
+    test_appliance.run(globals())
 
-TestMark.add_tests('testMarks', '.marks')
-