Index: trunk/src/python/unifiedlogger/test_logging_service.py =================================================================== --- trunk/src/python/unifiedlogger/test_logging_service.py (revision 478) +++ trunk/src/python/unifiedlogger/test_logging_service.py (revision 478) @@ -0,0 +1,12 @@ +from logging_service import toHMS + +def test_toHMS(): + assert toHMS(1) == "0:00:01" + assert toHMS(3599) == "0:59:59" + assert toHMS(3600) == "1:00:00" + assert toHMS(3601) == "1:00:01" + print "Pass" + +test_toHMS() + + Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 471) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 478) @@ -6,5 +6,20 @@ [project attributes] debug.launch-configs = (2, - {'launch-Dap54cn2qAN7AXZm': ({}, + {'launch-79fWcT8eQm1A3xyz': ({}, + {'buildcmd': ('project', + None), + 'env': ('project', + [u'']), + 'name': 'unit test', + 'pyexec': ('custom', + u'/usr/bin/pytest'), + 'pypath': ('project', + []), + 'pyrunargs': ('project', + '-u'), + 'runargs': u'', + 'rundir': ('custom', + u'/home/jdalbey/Dropbox/TMCrepo/trunk/src/python/unifiedlogger')}), + 'launch-Dap54cn2qAN7AXZm': ({}, {'buildcmd': ('project', None), @@ -32,8 +47,8 @@ (u'', 'launch-Dap54cn2qAN7AXZm'))} -proj.main-file = loc('__main__.py') [user attributes] debug.show-args-dialog = {loc('__main__.py'): False} -edit.file-encoding = {loc('get_revision'): 'UTF-8'} +edit.file-encoding = {loc('get_revision'): 'UTF-8', + loc('test_logging_service.py'): 'UTF-8'} guimgr.overall-gui-state = {'windowing-policy': 'combined-window', 'windows': [{'name': '0BtsNVOAornvyNAPNOxHAmuDFR'\ @@ -85,5 +100,5 @@ 'current_pages': [3, 1], - 'notebook_display': 'hidden', + 'notebook_display': 'normal', 'notebook_percent': 0.30000000000000004, 'override_title': None, @@ -183,163 +198,17 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('cad_watcher.py'), - {'attrib-starts': [('isFull|0|', - 16)], - 'code-line': '\n', - 'first-line': 27L, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('activitylog_watcher.py'), + {'attrib-starts': [('getLogEntries|0|', + 42)], + 'code-line': ' desiredFields = "Activity Log.,"+name+","+cod'\ + 'e+","+msg\n', + 'first-line': 33L, 'folded-linenos': [], - 'sel-line': 18L, - 'sel-line-start': 559L, - 'selection_end': 559L, - 'selection_start': 559L, + 'sel-line': 55L, + 'sel-line-start': 1666L, + 'selection_end': 1728L, + 'selection_start': 1728L, 'zoom': 0L}, - 1564182715.806107], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # Append simulation time and the log entri'\ - 'es to the Output Buffer\n', - 'first-line': 38L, - 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1843L, - 'selection_end': 1851L, - 'selection_start': 1851L, - 'zoom': 0L}, - 1564182751.746078], - [loc('cad_watcher.py'), - {'attrib-starts': [('isFull|0|', - 16)], - 'code-line': '\n', - 'first-line': 21L, - 'folded-linenos': [], - 'sel-line': 18L, - 'sel-line-start': 559L, - 'selection_end': 559L, - 'selection_start': 559L, - 'zoom': 0L}, - 1564182793.261813], - [loc('__main__.py'), - {'attrib-starts': [], - 'code-line': 'import logging_service, os, ConfigParser\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 40L, - 'selection_start': 28L, - 'zoom': 0L}, - 1564182798.481531], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # Append simulation time and the log entri'\ - 'es to the Output Buffer\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1843L, - 'selection_end': 1851L, - 'selection_start': 1851L, - 'zoom': 0L}, - 1564182969.909882], - [loc('cad_watcher.py'), - {'attrib-starts': [], - 'code-line': 'lastLineNum = 0\n', - 'first-line': 7L, - 'folded-linenos': [], - 'sel-line': 11L, - 'sel-line-start': 417L, - 'selection_end': 432L, - 'selection_start': 432L, - 'zoom': 0L}, - 1564183893.9794], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # Append simulation time and the log entri'\ - 'es to the Output Buffer\n', - 'first-line': 39L, - 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1843L, - 'selection_end': 1851L, - 'selection_start': 1851L, - 'zoom': 0L}, - 1564184320.038293], - [loc('cad_watcher.py'), - {'attrib-starts': [], - 'code-line': 'lastLineNum = 0\n', - 'first-line': 10L, - 'folded-linenos': [], - 'sel-line': 11L, - 'sel-line-start': 417L, - 'selection_end': 432L, - 'selection_start': 432L, - 'zoom': 0L}, - 1564189528.213135], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # Append simulation time and the log entri'\ - 'es to the Output Buffer\n', - 'first-line': 21L, - 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1843L, - 'selection_end': 1851L, - 'selection_start': 1851L, - 'zoom': 0L}, - 1564189539.194298], - [loc('cad_watcher.py'), - {'attrib-starts': [('setup|0|', - 41)], - 'code-line': 'def setup():\n', - 'first-line': 24L, - 'folded-linenos': [], - 'sel-line': 41L, - 'sel-line-start': 1329L, - 'selection_end': 1329L, - 'selection_start': 1329L, - 'zoom': 0L}, - 1564287471.970187], - [loc('../../../../../../../../usr/lib/python2.7/genericpath.py'), - {'attrib-starts': [('getsize|0|', - 54)], - 'code-line': ' return os.stat(filename).st_size\n', - 'first-line': 39L, - 'folded-linenos': [], - 'sel-line': 56L, - 'sel-line-start': 1506L, - 'selection_end': 1506L, - 'selection_start': 1506L, - 'zoom': 0L}, - 1564287481.404096], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': " msgList = text_file.read().split('\\n')"\ - "\n", - 'first-line': 29L, - 'folded-linenos': [], - 'sel-line': 52L, - 'sel-line-start': 1613L, - 'selection_end': 1613L, - 'selection_start': 1613L, - 'zoom': 0L}, - 1564324057.330601], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 42)], - 'code-line': ' desiredFields = "Activity Log.,"+name+","+co'\ - 'de+","+msg\n', - 'first-line': 33L, - 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1666L, - 'selection_end': 1728L, - 'selection_start': 1728L, - 'zoom': 0L}, - 1564408367.809524], + 1564408367.809524], [loc('cad_watcher.py'), {'attrib-starts': [('getLogEntries|0|', @@ -431,18 +300,168 @@ 'selection_start': 1143L, 'zoom': 0L}, - 1564438185.449366]], + 1564438185.449366], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1564440773.252122], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('getLogEntries|0|', + 42)], + 'code-line': ' desiredFields = "Activity Log.,"+name+","+co'\ + 'de+" "+msg\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 55L, + 'sel-line-start': 1666L, + 'selection_end': 1723L, + 'selection_start': 1723L, + 'zoom': 0L}, + 1564453007.218601], + [loc('cad_watcher.py'), + {'attrib-starts': [('getLogEntries|0|', + 24)], + 'code-line': ' print pathToLog + " missing: assuming re'\ + 'set."\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 37L, + 'sel-line-start': 1087L, + 'selection_end': 1143L, + 'selection_start': 1143L, + 'zoom': 0L}, + 1564453014.195405], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1564453030.973979], + [loc('unknown:untitled-1.py'), + {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1564453042.242505], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1564453047.692926], + [loc('test_logging_service.py'), + {'attrib-starts': [('test_toHMS|0|', + 0)], + 'code-line': ' ', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 3L, + 'sel-line-start': 57L, + 'selection_end': 61L, + 'selection_start': 61L, + 'zoom': 0L}, + 1564453169.869372], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1564453453.032643], + [loc('test_logging_service.py'), + {'attrib-starts': [('test_toHMS|0|', + 2)], + 'code-line': ' ', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 7L, + 'sel-line-start': 194L, + 'selection_end': 198L, + 'selection_start': 198L, + 'zoom': 0L}, + 1564453867.007001], + [loc('test_logging_service.py'), + {'attrib-starts': [('test_toHMS|0|', + 2)], + 'code-line': 'def test_toHMS():\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 2L, + 'sel-line-start': 35L, + 'selection_end': 49L, + 'selection_start': 39L, + 'zoom': 0L}, + 1564453872.826719], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 13)], + 'code-line': ' print "Proceeding with previous time: ", toHM'\ + 'S(seconds)\n', + 'first-line': 30L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 649L, + 'selection_end': 649L, + 'selection_start': 649L, + 'zoom': 0L}, + 1564453933.136133], + [loc('test_logging_service.py'), + {'attrib-starts': [('test_toHMS|0|', + 2)], + 'code-line': ' assert toHMS(3601) == "1:00:01"\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 6L, + 'sel-line-start': 158L, + 'selection_end': 192L, + 'selection_start': 192L, + 'zoom': 0L}, + 1564454686.591132]], 20), - 'current-loc': loc('logging_service.py'), + 'current-loc': loc('cad_watcher.py'), 'editor-state-list': [(loc('activitylog_watcher.py'), {'attrib-starts': [('getLogEntries|0|', 42)], 'code-line': ' desiredFields = "Activ'\ - 'ity Log.,"+name+","+code+","+msg\n', - 'first-line': 33L, + 'ity Log.,"+name+","+code+" "+msg\n', + 'first-line': 0L, 'folded-linenos': [], 'sel-line': 55L, 'sel-line-start': 1666L, - 'selection_end': 1728L, - 'selection_start': 1728L, + 'selection_end': 1723L, + 'selection_start': 1723L, 'zoom': 0L}), (loc('cad_watcher.py'), @@ -451,5 +470,5 @@ 'code-line': ' print pathToLog + '\ '" missing: assuming reset."\n', - 'first-line': 32L, + 'first-line': 45L, 'folded-linenos': [], 'sel-line': 37L, @@ -484,5 +503,5 @@ 'code-line': ' print "Proceeding with '\ 'previous time: ", toHMS(seconds)\n', - 'first-line': 0L, + 'first-line': 30L, 'folded-linenos': [], 'sel-line': 21L, @@ -490,4 +509,16 @@ 'selection_end': 649L, 'selection_start': 649L, + 'zoom': 0L}), + (loc('test_logging_service.py'), + {'attrib-starts': [('test_toHMS|0|', + 2)], + 'code-line': ' assert toHMS(3601) == "1:0'\ + '0:01"\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 6L, + 'sel-line-start': 158L, + 'selection_end': 192L, + 'selection_start': 192L, 'zoom': 0L}), (loc('__main__.py'), @@ -509,4 +540,5 @@ loc('../../../config/logging_service.cfg'), loc('logging_service.py'), + loc('test_logging_service.py'), loc('__main__.py')]), 'open_files': [u'../../../config/logging_service.cfg', @@ -514,6 +546,7 @@ u'cms_watcher.py', u'activitylog_watcher.py', - u'cad_watcher.py', - u'logging_service.py']}, + u'logging_service.py', + u'test_logging_service.py', + u'cad_watcher.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, @@ -522,5 +555,5 @@ 'traversal_pos': ((0, 3), - 1564437523.022983), + 1564454637.847513), 'user_data': {}}, 'saved_notebook_display': None, @@ -530,5 +563,5 @@ 'traversal_pos': ((0, 4), - 1564438041.344573), + 1564454677.406196), 'user_data': {}}, 'window-alloc': (29, @@ -536,6 +569,7 @@ 1197, 722)}]} -guimgr.recent-documents = [loc('logging_service.py'), - loc('cad_watcher.py'), +guimgr.recent-documents = [loc('cad_watcher.py'), + loc('test_logging_service.py'), + loc('logging_service.py'), loc('activitylog_watcher.py'), loc('__main__.py'), Index: trunk/src/python/unifiedlogger/activitylog_watcher.py =================================================================== --- trunk/src/python/unifiedlogger/activitylog_watcher.py (revision 470) +++ trunk/src/python/unifiedlogger/activitylog_watcher.py (revision 478) @@ -54,5 +54,5 @@ code = item[4].replace(',','') msg = item[5].replace(',','') - desiredFields = "Activity Log.,"+name+","+code+","+msg + desiredFields = "Activity Log.,"+name+","+code+" "+msg # Append to results list resultList.append(desiredFields)