Add environment variable option for lpt arguments.

distributed_nose/plugin.py

@@ -86,7 +86,7 @@ def options(self, parser, env):
                 "hash-ring",
                 "least-processing-time"
             ),
-            default="hash-ring",
+            default=env.get('NOSE_DISTRIBUTION_ALGORITHM', "hash-ring"),
             metavar="ALGORITHM",
             help=(
                 "Specify an algorithm [hash-ring|least-processing-time] "
@@ -100,6 +100,7 @@ def options(self, parser, env):
             "--lpt-data",
             action="store",
             dest="lpt_data_filepath",
+            default=env.get('NOSE_LPT_DATA_FILEPATH'),
             help=(
                 "The filepath from which to retrieve the data to use for "
                 "the least processing time algorithm. Required when "
@@ -156,13 +157,13 @@ def configure(self, options, config):
                         reverse=True
                     )
 
-                    for cls, data in sorted_lpt_data:
+                    for c, data in sorted_lpt_data:
                         node = min(
                             self.lpt_nodes[1:],
                             key=lambda n: n['processing_time']
                         )
                         node['processing_time'] += data['duration']
-                        node['classes'].add(cls)
+                        node['classes'].add(c)
 
             except IOError:
                 logger.critical(
@@ -249,7 +250,8 @@ def wantClass(self, cls):
                 # only if we were given the classes for consideration in
                 # the same order across all nodes).
                 node = self.hash_ring.get_node(str(cls))
-                return node == self.node_id
+                if node != self.node_id:
+                    return False
 
         return None
 

tests/test_distribution.py

@@ -162,6 +162,7 @@ def test_only_largest_included(self):
         )
 
         self.assertTrue(len(classes) == 1)
+        # TODO: make compatible with python 2.6 ?
         self.assertIn('TC5', classes)
 
     # Function selection should not have changed.

tests/test_options.py

@@ -122,6 +122,7 @@ def test_lpt_no_data_arg_aborts(self):
         ]
         options, _ = self.parser.parse_args(args)
 
+        # TODO: make compatible with python 2.6 ?
         with self.assertRaises(AssertionError):
             self.plugin.configure(options, Config())
 
@@ -139,6 +140,7 @@ def test_lpt_missing_data_file_aborts(self):
         ]
         options, _ = self.parser.parse_args(args)
 
+        # TODO: make compatible with python 2.6 ?
         with self.assertRaises(IOError):
             self.plugin.configure(options, Config())
 
@@ -157,6 +159,7 @@ def test_lpt_invalid_json_file_aborts(self):
         ]
         options, _ = self.parser.parse_args(args)
 
+        # TODO: make compatible with python 2.6 ?
         with self.assertRaises(ValueError):
             self.plugin.configure(options, Config())
 
@@ -175,5 +178,6 @@ def test_lpt_invalid_data_format_aborts(self):
         ]
         options, _ = self.parser.parse_args(args)
 
+        # TODO: make compatible with python 2.6 ?
         with self.assertRaises(KeyError):
             self.plugin.configure(options, Config())