[Piglit] [PATCH 45/49] framework/options: Fix values for _Options.concurrent

[Dylan Baker]

This is currently being set to True, but valid options are "some",
"all", or "none".

This fixes the JSON validity unit test.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 framework/options.py                      | 4 ++--
 unittests/framework/backends/test_json.py | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/framework/options.py b/framework/options.py
index 29bddcc..28dcf93 100644
--- a/framework/options.py
+++ b/framework/options.py
@@ -171,7 +171,7 @@ class _Options(object):  # pylint: disable=too-many-instance-attributes
     the configuration file.
 
     Options are as follows:
-    concurrent -- True if concurrency is to be used
+    concurrent -- one of: ["all", "some", "none"]. Default: "some"
     execute -- False for dry run
     include_filter -- list of compiled regex which include exclusively tests
                       that match
@@ -186,7 +186,7 @@ class _Options(object):  # pylint: disable=too-many-instance-attributes
     exclude_filter = _ReListDescriptor('_exclude_filter', type_=_FilterReList)
 
     def __init__(self):
-        self.concurrent = True
+        self.concurrent = "some"
         self.execute = True
         self._include_filter = _ReList()
         self._exclude_filter = _ReList()
diff --git a/unittests/framework/backends/test_json.py b/unittests/framework/backends/test_json.py
index f29a046..3f2731b 100644
--- a/unittests/framework/backends/test_json.py
+++ b/unittests/framework/backends/test_json.py
@@ -131,8 +131,6 @@ class TestJSONBackend(object):
             with tmpdir.join('results.json').open('r') as f:
                 json.load(f)
 
-        # Currently our concurrent flag is set incorrectly
-        @pytest.mark.xfail
         def test_results_are_valid(self, tmpdir):
             """Test that the values produced are valid."""
             with tmpdir.join('results.json').open('r') as f:
-- 
2.9.0