Merge pull request #186 from PDXCapstoneF/bs-multiple-props

Fix issue where users could get too specific with props files and component types

src/benchmark_run.py

@@ -152,6 +152,10 @@ def __init__(self, component_type, rest=None):
         else:
             raise Exception(
                 "Unrecognized 'rest' given to SpecJBBComponentOptions: {}".format(rest))
+        if "-p" in self["options"]:
+            raise Exception("SpecJBBComponentOptions recieved external props file")
+        if "-m" in self["options"]:
+            raise Exception("SpecJBBComponentOptions recieved manual component type")
 
 
 class SpecJBBRun:

tests/test_benchmark_run.py

@@ -296,6 +296,25 @@ def test_given_dict(self):
             self.assertEqual(co["options"], options)
             self.assertEqual(co["jvm_opts"], jvm_opts)
 
+    def test_refuses_extra_prop_files(self):
+        options = ["-p", "an_extra_props_file.props"]
+
+        def construct_all_types(c):
+            with self.assertRaises(Exception):
+                SpecJBBComponentOptions(c, { "options": options })
+
+        component_options = list(map(construct_all_types, SpecJBBComponentTypes))
+
+    def test_refuses_setting_component_type(self):
+        options = ["-p", "an_extra_props_file.props"]
+
+        def construct_all_types(c):
+            with self.assertRaises(Exception):
+                SpecJBBComponentOptions(c, { "options": options })
+
+        component_options = list(map(construct_all_types, SpecJBBComponentTypes))
+
+
 
 class TestDo(unittest.TestCase):
     def test_do_calls_run_method_on_objects(self):