Update for new version of ComfyChair: some methods are renamed to be

more consistent, and it now looks at command-line arguments to work
out what to do.

Run this program to get a quick demonstration of what ComfyChair does.
(This used to be commit 9b0c59a10707b2bbe3837d718e5030a6cdf19bfa)

1 files changed, 14 insertions, 9 deletions

diff --git a/source3/stf/test.py b/source3/stf/test.py
index 2e9abd976fa..fb57926cc3a 100755
--- a/source3/stf/test.py
+++ b/source3/stf/test.py
@@ -3,26 +3,31 @@
 # meta-test-case / example for comfychair.  Should demonstrate
 # different kinds of failure.
 
-import comfychair, stf
+import comfychair
 
 class NormalTest(comfychair.TestCase):
-    def runTest(self):
+    def runtest(self):
         pass
 
 class RootTest(comfychair.TestCase):
-    def setUp(self):
+    def setup(self):
         self.require_root()
             
     def runTest(self):
         pass
 
 class GoodExecTest(comfychair.TestCase):
-    def runTest(self):
-        exit, stdout = self.runCmdUnchecked("ls -l")
+    def runtest(self):
+        stdout = self.runcmd("ls -l")
 
 class BadExecTest(comfychair.TestCase):
-    def setUp(self):
-        exit, stdout = self.runCmdUnchecked("spottyfoot --slobber",
-                                            skip_on_noexec = 1)
+    def setup(self):
+        exit, stdout = self.runcmd_unchecked("spottyfoot --slobber",
+                                             skip_on_noexec = 1)
+
+
+tests = [NormalTest, RootTest, GoodExecTest, BadExecTest]
 
-comfychair.runtests([NormalTest, RootTest, GoodExecTest, BadExecTest])
+if __name__ == '__main__':
+    comfychair.main(tests)
+