Fixed bug in monitoring log file

navix/monitor.py

@@ -103,7 +103,7 @@ class Monitor:
                         next_line_input_files = False
                     else:
                         next_line_input_files = True
-                        self.Input_Files.extend(line.split(", "))
+                        self.Input_Files.extend(line.split(","))
                 except Exception as e:
                     self.queue_logging.put("ERROR: " + str(self.thread_num)
                                            + ": Failed to get list of input files (string with server name)!\n"

navix/replygenerator/generate_file_list.py

@@ -69,7 +69,6 @@ def get_files_to_search_from_data(queue_logging, thread_num, data):
     try:
         input_tmp = str(data).replace("\n", ",").replace(",,", ",")
         # TODO: Check whether input_tmp should include invalid addresses
-        # TODO: Check whether input_tmp should include doubled comma (currently disabled)
     except Exception as e:
          queue_logging.put("ERROR: " + str(thread_num)
                               + ": Failed to save input files to local variable, data: "

tests/Test_monitor.py

@@ -82,9 +82,9 @@ class TestMonitor(TestCase):
                                                     + "\"END_OF_REQUESTED_FILES\n"
                 + self.settings.requested_files_mon + " = \"['/eos/opendata/cms/Run2012B/"
                                                     + "DoubleMuParked/AOD/22Jan2013-v1/"
-                                                    + "10000/1EC938EF-ABEC-E211-94E0-90E6BA442F24.root', '/eos/"
+                                                    + "10000/1EC938EF-ABEC-E211-94E0-90E6BA442F24.root','/eos/"
                                                     + "opendata/cms/Run2012B/DoubleMuParked/AOD/22Jan2013-v1/10000/"
-                                                    + "4804A3F3-CDEC-E211-BC43-00259073E4EA.root', "
+                                                    + "4804A3F3-CDEC-E211-BC43-00259073E4EA.root',"
                                                     + "'/eos/opendata/cms/Run2012B/DoubleMuParked/AOD/22Jan2013-v1/"
                                                     + "10000/649DE9C1-EFEC-E211-B82C-485B39800C0F.root']\"\n"
                 + self.settings.hpda_rank_monitoring + " = \"{'machine == \"ekpsg04.ekp.kit.edu\"': "
@@ -103,8 +103,8 @@ class TestMonitor(TestCase):
         self.assertEqual("Done at: ", lines[3][:len("Done at: ")])
         self.assertEqual("JobID: 1599920@SuperGuenther\n", lines[4])
         self.assertEqual("Requested files: ['/eos/opendata/cms/Run2012B/DoubleMuParked/AOD/22Jan2013-v1/10000/"
-                         + "1EC938EF-ABEC-E211-94E0-90E6BA442F24.root', '/eos/opendata/cms/Run2012B/DoubleMuParked/"
-                         + "AOD/22Jan2013-v1/10000/4804A3F3-CDEC-E211-BC43-00259073E4EA.root', "
+                         + "1EC938EF-ABEC-E211-94E0-90E6BA442F24.root','/eos/opendata/cms/Run2012B/DoubleMuParked/"
+                         + "AOD/22Jan2013-v1/10000/4804A3F3-CDEC-E211-BC43-00259073E4EA.root',"
                          + "'/eos/opendata/cms/Run2012B/DoubleMuParked/AOD/22Jan2013-v1/10000/"
                          + "649DE9C1-EFEC-E211-B82C-485B39800C0F.root']\n", lines[5])
         self.assertEqual("File found on server: {'/eos/opendata/cms/Run2012B/DoubleMuParked/AOD/22Jan2013-v1/10000/"