working web and cmd line mode

mogui · Sep 19, 2013 · e614fd2 · e614fd2
1 parent 3ea868f
commit e614fd2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/autobahntestsuite/autobahntestsuite/interfaces.py b/autobahntestsuite/autobahntestsuite/interfaces.py
@@ -186,8 +186,11 @@ def progress(runId, testRun, testCase, result, remaining):
 
 class ITestCase(Interface):
    """
+   Tests are instantiated as objects providing this interface.
+   They have their run() method called exactly once before
+   being disposed.
    """
-   index = Attribute("""Test case index.""")
+   index = Attribute("""Test case index - a tuple of ints.""")
    description = Attribute("""Test case description.""")
    expectation = Attribute("""Test case expectation.""")
    params = Attribute("""Test case parameters.""")

diff --git a/autobahntestsuite/autobahntestsuite/wampfuzzing.py b/autobahntestsuite/autobahntestsuite/wampfuzzing.py
@@ -69,6 +69,7 @@ def runAndObserve(self, specName, observers_ = [], saveResults = True):
       specId, spec = yield self._testDb.getSpecByName(specName)
       casesByTestee = yield self._testDb.generateCasesByTestee(specId)
       _observers = observers_[:]
+      #_observers = observers_
 
       ## publish WAMP event on test case finished
       ##

diff --git a/autobahntestsuite/autobahntestsuite/wstest.py b/autobahntestsuite/autobahntestsuite/wstest.py
@@ -254,20 +254,25 @@ def __init__(self):
 
    def startService(self):
 
-      if self.mode == "import":
-         return self.startImportSpec(self.options['spec'])
+      try:
 
-      elif self.mode == "export":
-         return self.startExportSpec(self.options['testset'], self.options.get('spec', None))
+         if self.mode == "import":
+            return self.startImportSpec(self.options['spec'])
 
-      elif self.mode == "fuzzingwampclient":
-         return self.startFuzzingWampClient(self.options['testset'])
+         elif self.mode == "export":
+            return self.startExportSpec(self.options['testset'], self.options.get('spec', None))
 
-      elif self.mode == "web":
-         return self.startWeb(debug = self.debug)
+         elif self.mode == "fuzzingwampclient":
+            return self.startFuzzingWampClient(self.options['testset'])
 
-      else:
-         pass
+         elif self.mode == "web":
+            return self.startWeb(debug = self.debug)
+
+         else:
+            pass
+      except Exception, e:
+         print e
+         reactor.stop()
 
 
       methodMapping = {
@@ -300,18 +305,17 @@ def startFuzzingWampClient(self, specName):
       """
       Start a WAMP fuzzing client test run using a spec previously imported.
       """
-
       testSet = WampCaseSet()
       testDb = TestDb([testSet])
       testRunner = FuzzingWampClient(testDb)
 
       def progress(runId, testRun, testCase, result, remaining):
          if testCase:
-            print "%s - %s%s (%d tests remaining)" % (testRun.testee.name, "PASSED   : " if result.passed else "FAILED  : ", testCase.__class__.__name__, remaining)
+            print "%s - %s %s (%d tests remaining)" % (testRun.testee.name, "PASSED   : " if result.passed else "FAILED  : ", testCase.__class__.__name__, remaining)
          else:
             print "FINISHED : Test run for testee '%s' ended." % testRun.testee.name
 
-      runId, resultIds = yield testRunner.runAndObserve(specName, observers = [progress])
+      runId, resultIds = yield testRunner.runAndObserve(specName, [progress])
 
       print
       print "Tests finished: run ID %s, result IDs %d" % (runId, len(resultIds))

diff --git a/examples/fuzzingwampclient/local.json b/examples/fuzzingwampclient/local.json
@@ -5,7 +5,7 @@
    "mode": "fuzzingwampclient",
 
    "caseset": "wamp",
-   "cases": ["*"],
+   "cases": ["2.1.1.*"],
    "exclude": [],
 
    "options": {