Haruka Yoshihara
null+****@clear*****
Thu Dec 13 12:06:42 JST 2012
Haruka Yoshihara 2012-12-13 12:06:42 +0900 (Thu, 13 Dec 2012) New Revision: d54cdf6a2585b767bfd0af4f19111ba5a838924e https://github.com/groonga/groonga-query-log/commit/d54cdf6a2585b767bfd0af4f19111ba5a838924e Log: test: ignore timezone for "start_time" and "last_time" of JSON formatted results Modified files: test/fixtures/json.expected test/test-analyzer.rb Modified: test/fixtures/json.expected (+1 -1) =================================================================== --- test/fixtures/json.expected 2012-12-13 11:29:57 +0900 (4129cd5) +++ test/fixtures/json.expected 2012-12-13 12:06:42 +0900 (1884102) @@ -1,3 +1,3 @@ [ -{"start_time":1355301557,"last_time":1355301557,"elapsed":0.00121714,"return_code":0,"command":{"raw":"select --table Users --query follower:@groonga --output_columns _key,name","name":"select","parameters":[{"key":"table","value":"Users"},{"key":"query","value":"follower:@groonga"},{"key":"output_columns","value":"_key,name"}]},"operations":[{"name":"filter","relative_elapsed":0.0008429529999999999,"context":"query: follower:@groonga"},{"name":"select","relative_elapsed":2.7947e-05,"context":null},{"name":"output","relative_elapsed":0.000195852,"context":"_key,name"}]} +{"start_time":START_TIME,"last_time":LAST_TIME,"elapsed":0.00121714,"return_code":0,"command":{"raw":"select --table Users --query follower:@groonga --output_columns _key,name","name":"select","parameters":[{"key":"table","value":"Users"},{"key":"query","value":"follower:@groonga"},{"key":"output_columns","value":"_key,name"}]},"operations":[{"name":"filter","relative_elapsed":0.0008429529999999999,"context":"query: follower:@groonga"},{"name":"select","relative_elapsed":2.7947e-05,"context":null},{"name":"output","relative_elapsed":0.000195852,"context":"_key,name"}]} ] Modified: test/test-analyzer.rb (+5 -0) =================================================================== --- test/test-analyzer.rb 2012-12-13 11:29:57 +0900 (405a221) +++ test/test-analyzer.rb 2012-12-13 12:06:42 +0900 (1ce44d3) @@ -57,6 +57,11 @@ class AnalyzerTest < Test::Unit::TestCase def test_to_json actual_result = run_analyzer("--reporter", "json", @query_log_path) + + actual_result = actual_result.gsub(/(\"start_time\"):(\d+)/, + "\\1:START_TIME") + actual_result = actual_result.gsub(/(\"last_time\"):(\d+)/, + "\\1:LAST_TIME") expected_result = expected_analyzed_query("json.expected") assert_equal(expected_result, actual_result) end -------------- next part -------------- HTML����������������������������...Download
