# HG changeset patch # User Jana Fabrikova # Date 1396359720 -7200 # Node ID 1191b3a92ad1fa622eb7f6ed5476cabed4ee5373 # Parent 3dc54730c5a72d5a163ff99821f3e58e39825542 miscellaneous smaller modifications diff -r 3dc54730c5a7 -r 1191b3a92ad1 ChangeLog --- a/ChangeLog Tue Apr 01 15:13:21 2014 +0200 +++ b/ChangeLog Tue Apr 01 15:42:00 2014 +0200 @@ -1,3 +1,17 @@ +2014-04-01 Jana Fabrikova + + * outputtexts/1.1.0/output_of_help_therm_shell.txt: + * outputtexts/1.1.0/thermostat.txt: + * outputtexts/1.1.0/thermostat_help.txt: + updating the output texts (new commands in thermostat) + * src/org/thermostat/qa/testsuites/CliClientDBModifWebStorageTest.java: + small modifications of the testsuite + * src/org/thermostat/qa/testsuites/CommandChannelWebStorageTest.java: + adding a comment describing the commands output + * templates/graph.html: + * templates/index.html: + substituting NOT APPLICABLE on several places instead of IGNORED + 2014-04-01 Jana Fabrikova * scripts/stop_all_therm_agents.sh: @@ -181,8 +195,8 @@ * patterns/1.1.0/noAA/VMView/GcTab/display_label.png: * patterns/1.1.0/noAA/VMView/GcTab/gc_label.png: * patterns/1.1.0/noAA/VMView/GcTab/gc_time_legend.png: - * /1.1.0/noAA/VMView/GcTab/running_on_label.png: - * /1.1.0/noAA/VMView/HeapAnalyzerTab/graph_inner_pixel_color.png: + * patterns/1.1.0/noAA/VMView/GcTab/running_on_label.png: + * patterns/1.1.0/noAA/VMView/HeapAnalyzerTab/graph_inner_pixel_color.png: * patterns/1.1.0/noAA/VMView/HeapAnalyzerTab/heap_capacity_label.png: * patterns/1.1.0/noAA/VMView/HeapAnalyzerTab/heap_capacity_legend.png: * patterns/1.1.0/noAA/VMView/HeapAnalyzerTab/heap_capacity_pixel.png: diff -r 3dc54730c5a7 -r 1191b3a92ad1 outputtexts/1.1.0/output_of_help_therm_shell.txt --- a/outputtexts/1.1.0/output_of_help_therm_shell.txt Tue Apr 01 15:13:21 2014 +0200 +++ b/outputtexts/1.1.0/output_of_help_therm_shell.txt Tue Apr 01 15:42:00 2014 +0200 @@ -9,6 +9,7 @@ dump-heap trigger a heap dump on the VM find-objects finds objects in a heapdump find-root finds the shortest path from an object to a GC root + list-categories lists all registered categories in Storage list-heap-dumps list all heap dumps list-vms lists all currently monitored VMs object-info prints information about an object in a heap dump diff -r 3dc54730c5a7 -r 1191b3a92ad1 outputtexts/1.1.0/thermostat.txt --- a/outputtexts/1.1.0/thermostat.txt Tue Apr 01 15:13:21 2014 +0200 +++ b/outputtexts/1.1.0/thermostat.txt Tue Apr 01 15:42:00 2014 +0200 @@ -7,6 +7,7 @@ find-objects finds objects in a heapdump find-root finds the shortest path from an object to a GC root gui launches the GUI client + list-categories lists all registered categories in Storage list-heap-dumps list all heap dumps list-vms lists all currently monitored VMs object-info prints information about an object in a heap dump diff -r 3dc54730c5a7 -r 1191b3a92ad1 outputtexts/1.1.0/thermostat_help.txt --- a/outputtexts/1.1.0/thermostat_help.txt Tue Apr 01 15:13:21 2014 +0200 +++ b/outputtexts/1.1.0/thermostat_help.txt Tue Apr 01 15:42:00 2014 +0200 @@ -7,6 +7,7 @@ find-objects finds objects in a heapdump find-root finds the shortest path from an object to a GC root gui launches the GUI client + list-categories lists all registered categories in Storage list-heap-dumps list all heap dumps list-vms lists all currently monitored VMs object-info prints information about an object in a heap dump diff -r 3dc54730c5a7 -r 1191b3a92ad1 src/org/thermostat/qa/testsuites/CliClientDBModifWebStorageTest.java --- a/src/org/thermostat/qa/testsuites/CliClientDBModifWebStorageTest.java Tue Apr 01 15:13:21 2014 +0200 +++ b/src/org/thermostat/qa/testsuites/CliClientDBModifWebStorageTest.java Tue Apr 01 15:42:00 2014 +0200 @@ -158,7 +158,7 @@ * @throws IOException * @throws AWTException */ - @SinceVersion("1.1.0") + @SinceVersion("1.0.0") @StorageType(StorageTypes.WEBTOMCAT_STORAGE) public void testAddVMAndSeeItInShellTest2() throws IOException, AWTException { @@ -223,7 +223,9 @@ { logInfo("run", "Adding vm to mongo: " + s); } - + + sleep(2000); + // run shell command list-vms output1 = runCommandsInThermostatShell(commands); diff -r 3dc54730c5a7 -r 1191b3a92ad1 src/org/thermostat/qa/testsuites/CommandChannelWebStorageTest.java --- a/src/org/thermostat/qa/testsuites/CommandChannelWebStorageTest.java Tue Apr 01 15:13:21 2014 +0200 +++ b/src/org/thermostat/qa/testsuites/CommandChannelWebStorageTest.java Tue Apr 01 15:42:00 2014 +0200 @@ -254,7 +254,32 @@ } - + /* + * output for client-tester: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Please enter username for storage at http://127.0.0.1:8080/thermostat/storage:client-tester +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Please enter password for storage at http://127.0.0.1:8080/thermostat/storage: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Queuing ping request. Destination: /127.0.0.1:12000 +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: The server refused to ping due to authentication/authorization issues. +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Please enter username for storage at http://127.0.0.1:8080/thermostat/storage:client-tester +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Please enter password for storage at http://127.0.0.1:8080/thermostat/storage: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Queuing ping request. Destination: /127.0.0.1:12000 +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: The server refused to ping due to authentication/authorization issues. +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: + +output for cmdc-tester: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Please enter username for storage at http://127.0.0.1:8080/thermostat/storage:cmdc-tester +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Please enter password for storage at http://127.0.0.1:8080/thermostat/storage: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Queuing ping request. Destination: /127.0.0.1:12000 +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: Response received from: /127.0.0.1:12000 +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping exist: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Please enter username for storage at http://127.0.0.1:8080/thermostat/storage:cmdc-tester +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Please enter password for storage at http://127.0.0.1:8080/thermostat/storage: +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Queuing ping request. Destination: /127.0.0.1:12000 +INFO: org.thermostat.qa.testsuites.CommandChannelWebStorageTest.Ping nonexist: Error received from: /127.0.0.1:12000 + + */ + public static void main(String[] args) { new CommandChannelWebStorageTest().doTests(args); diff -r 3dc54730c5a7 -r 1191b3a92ad1 templates/graph.html --- a/templates/graph.html Tue Apr 01 15:13:21 2014 +0200 +++ b/templates/graph.html Tue Apr 01 15:42:00 2014 +0200 @@ -84,7 +84,7 @@ {data:d_passed, mouse:{track: true}, label:'PASSED', lines:{fill:false}}, {data:d_failed, mouse:{track: true}, label:'FAILED', lines:{fill:false}}, {data:d_error, mouse:{track: true}, label:'ERROR', lines:{fill:false}}, - {data:d_ignored, mouse:{track: true}, label:'IGNORED', lines:{fill:false}}, + {data:d_ignored, mouse:{track: true}, label:'NOT APPLICABLE', lines:{fill:false}}, ], { lines: {show: true}, points: {show: true}, @@ -132,7 +132,7 @@ {data:d_none, mouse:{track: false}, label:'', lines:{fill:false, show:false}}, {data:d_failed, mouse:{track: true}, label:'FAILED', lines:{fill:false}}, {data:d_error, mouse:{track: true}, label:'ERROR', lines:{fill:false}}, - {data:d_ignored, mouse:{track: true}, label:'IGNORED', lines:{fill:false}}, + {data:d_ignored, mouse:{track: true}, label:'NOT APPLICABLE', lines:{fill:false}}, ], { lines: {show: true}, points: {show: true}, @@ -159,7 +159,7 @@ - + ${TABLE_DATA}
#DatePassedFailedErrorIgnored
#DatePassedFailedErrorNot applicable
diff -r 3dc54730c5a7 -r 1191b3a92ad1 templates/index.html --- a/templates/index.html Tue Apr 01 15:13:21 2014 +0200 +++ b/templates/index.html Tue Apr 01 15:42:00 2014 +0200 @@ -56,14 +56,14 @@ ${DATE} Log location: - + log_${DATE}.html Passed Failed Error - Ignored + Not applicable ${PASSED}