commit d88f14f567a3c3ad02511b6cccfd26a8a95b59e8
author Ilja H. Friedel <ihf@chromium.org> Wed Mar 13 21:58:37 2013 -0700
committer Ilja H. Friedel <ihf@chromium.org> Wed Mar 13 21:59:51 2013 -0700
tree 4d7b96e5da5e161d997b32470e5bb8d41b9e5702
parent b8e567c28e7eb5db90510d49fb5df518b462797f

Revert "framework: Allow tests to be documented and marked as disabled"

This reverts commit 2cae4432e00241710d6546e6c748f1c9e39dfbf5

Change-Id: I600ffdb3aa54605e6ba1d6488558eaa6c5603603
chromium-os:39367
Reviewed-on: https://gerrit.chromium.org/gerrit/45385
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>

framework/src/main.py

diff --git a/framework/src/main.py b/framework/src/main.py
index 58caf10..e90f0db 100644
--- a/framework/src/main.py
+++ b/framework/src/main.py
@@ -94,12 +94,8 @@
   sorted_results_items = sorted(results.items())
   for key, value in sorted_results_items:
     print "### Validation report for", key
-    print value["description"]
-    if value["disabled"]:
-      print "DISABLED"
-    else:
-      print value["logs"]["validation"]
-      print value["error"]
+    print value["logs"]["validation"]
+    print value["error"]
 
   # load reference
   ref = {}
@@ -117,8 +113,6 @@
       # format result to string
       if value["result"] == "success":
         return "%s (%.4f)" % (value["result"], value["score"])
-      elif value["disabled"]:
-        return "disabled"
       else:
         return value["result"]
 

framework/src/test_case.py

diff --git a/framework/src/test_case.py b/framework/src/test_case.py
index 071da41..0b97e7c 100755
--- a/framework/src/test_case.py
+++ b/framework/src/test_case.py
@@ -133,16 +133,6 @@
     return self._CommonFile(".props")
 
   @property
-  def description(self):
-    module = self.module
-    return module.Validate.__doc__ if module.Validate.__doc__ else ""
-
-  @property
-  def disabled(self):
-    module = self.module
-    return hasattr(module.Validate, "disabled") and module.Validate.disabled
-
-  @property
   def module(self):
     module_file = self.case_module_file
     if not path.exists(module_file):

framework/src/test_runner.py

diff --git a/framework/src/test_runner.py b/framework/src/test_runner.py
index 711b9f8..89f8e92 100755
--- a/framework/src/test_runner.py
+++ b/framework/src/test_runner.py
@@ -57,8 +57,6 @@
       },
       "error": "",
       "events": "",
-      "description": "",
-      "disabled": False,
       "gestures": "",
       "result": "",
       "score": 0
@@ -70,12 +68,6 @@
       out["result"] = "error"
       return out
 
-    out["description"] = test_case.description
-
-    if test_case.disabled:
-      out["disabled"] = True
-      return out
-
     try:
       properties = json.dumps(test_case.gesture_props)
       replay = Replay(test_case.platform_dat_file)