From ed69faa53c647f31cf49ccb456117946f6cbc9ed Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 20 Jul 2017 10:16:42 +0100
Subject: [PATCH] Flake8
---
force_bdss/cli/tests/test_execution.py | 8 +++++---
force_bdss/io/workflow_reader.py | 9 +++++----
force_bdss/tests/fixtures/__init__.py | 6 +++++-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/force_bdss/cli/tests/test_execution.py b/force_bdss/cli/tests/test_execution.py
index d511f79..80f3c87 100644
--- a/force_bdss/cli/tests/test_execution.py
+++ b/force_bdss/cli/tests/test_execution.py
@@ -3,6 +3,8 @@ import subprocess
import os
from contextlib import contextmanager
+from force_bdss.tests import fixtures
+
@contextmanager
def cd(dir):
@@ -22,17 +24,17 @@ def fixture_dir():
class TestExecution(unittest.TestCase):
def test_plain_invocation_mco(self):
- with cd(fixture_dir()):
+ with cd(fixtures.dirpath()):
out = subprocess.check_call(["force_bdss", "test_csv.json"])
self.assertEqual(out, 0)
def test_unsupported_file_input(self):
- with cd(fixture_dir()):
+ with cd(fixtures.dirpath()):
with self.assertRaises(subprocess.CalledProcessError):
subprocess.check_call(["force_bdss", "test_csv_v2.json"])
def test_corrupted_file_input(self):
- with cd(fixture_dir()):
+ with cd(fixtures.dirpath()):
with self.assertRaises(subprocess.CalledProcessError):
subprocess.check_call(["force_bdss",
"test_csv_corrupted.json"])
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index 5b4dab2..643da8c 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -47,14 +47,15 @@ class WorkflowReader(HasStrictTraits):
wf = Workflow()
try:
- workflow_data = json_data["workflow"]
- wf.multi_criteria_optimizer = self._extract_mco(workflow_data)
- wf.data_sources[:] = self._extract_data_sources(workflow_data)
- wf.kpi_calculators[:] = self._extract_kpi_calculators(workflow_data)
+ wf_data = json_data["workflow"]
+ wf.multi_criteria_optimizer = self._extract_mco(wf_data)
+ wf.data_sources[:] = self._extract_data_sources(wf_data)
+ wf.kpi_calculators[:] = self._extract_kpi_calculators(wf_data)
except KeyError as e:
logging.exception("Could not read file")
raise InvalidFileException("Could not read file. "
"Unable to find key {}".format(e))
+ return wf
def _extract_mco(self, json_data):
registry = self.bundle_registry
diff --git a/force_bdss/tests/fixtures/__init__.py b/force_bdss/tests/fixtures/__init__.py
index 1c5217a..8ad2b16 100644
--- a/force_bdss/tests/fixtures/__init__.py
+++ b/force_bdss/tests/fixtures/__init__.py
@@ -2,4 +2,8 @@ from os.path import join, dirname, abspath
def get(filename):
- return join(dirname(abspath(__file__)), filename)
+ return join(dirpath(), filename)
+
+
+def dirpath():
+ return dirname(abspath(__file__))
--
GitLab