Merge pull request #105 from MarcCote/fix_nondeterministic_behavior

[FIX] use OrderedDict in PBS. [PEP8] replaced tabs with spaces.

Author: mgermain

smartdispatch/pbs.py

@@ -1,4 +1,5 @@
 import re
+from collections import OrderedDict
 
 regex_walltime = re.compile("(\d+:){1,4}")
 regex_resource_nodes = re.compile("[a-zA-Z0-9]+(:ppn=\d+)?(:gpus=\d+)?(:[a-zA-Z0-9]+)*")
@@ -26,10 +27,10 @@ def __init__(self, queue_name, walltime):
         self.modules = []
         self.commands = []
 
-        self.resources = {}
+        self.resources = OrderedDict()
         self.add_resources(walltime=walltime)
 
-        self.options = {}
+        self.options = OrderedDict()
         self.add_options(q=queue_name)
 
         # Declares that all environment variables in the qsub command's environment are to be exported to the batch job.

smartdispatch/tests/test_pbs.py

@@ -72,8 +72,8 @@ def test_add_commands(self):
     def test_str(self):
         # Create simple PBS file
         expected = """#!/bin/bash
-#PBS -V
 #PBS -q qtest@mp2
+#PBS -V
 #PBS -l walltime=01:00:00
 
 # Modules #
@@ -90,11 +90,11 @@ def test_str(self):
         modules = ["CUDA_Toolkit/6.0", "python2.7"]
 
         expected = """#!/bin/bash
-#PBS -A xyz-123-ab
-#PBS -V
 #PBS -q qtest@mp2
-#PBS -l nodes=2:ppn=3:gpus=1
+#PBS -V
+#PBS -A xyz-123-ab
 #PBS -l walltime=01:00:00
+#PBS -l nodes=2:ppn=3:gpus=1
 
 # Modules #
 module load CUDA_Toolkit/6.0

tests/test_smart_dispatch.py

@@ -62,7 +62,6 @@ def test_main_resume(self):
 
         # Test when batch_uid is a path instead of a jobname.
         # Setup
-        call(self.launch_command, shell=True)
         batch_uid = os.path.join(self.logs_dir, os.listdir(self.logs_dir)[0])
 
         # Simulate that some commands are in the running state.