From 74a40d7b67e94e3f7207ec7bd08d94eaa50e67f7 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 26 Jul 2017 21:33:34 +0000 Subject: [PATCH] Fix testzz --- .../SqlLab/components/ResultSet.jsx | 5 ++- tests/db_engine_specs_test.py | 40 ++++++++++--------- tests/sqllab_tests.py | 4 +- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx index c04c3c911e5c1..f306050696643 100644 --- a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx +++ b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx @@ -166,7 +166,10 @@ export default class ResultSet extends React.PureComponent { } if (query.trackingUrl) { trackingUrl = ( - ); diff --git a/tests/db_engine_specs_test.py b/tests/db_engine_specs_test.py index 626a97bb3f9c3..a3038132c0a8c 100644 --- a/tests/db_engine_specs_test.py +++ b/tests/db_engine_specs_test.py @@ -5,7 +5,7 @@ import unittest -from superset import db_engine_specs +from superset.db_engine_specs import HiveEngineSpec class DbEngineSpecsTestCase(unittest.TestCase): @@ -13,36 +13,38 @@ def test_0_progress(self): log = """ 17/02/07 18:26:27 INFO log.PerfLogger: 17/02/07 18:26:27 INFO log.PerfLogger: - """ - self.assertEquals(0, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals( + 0, HiveEngineSpec.progress(log)) def test_0_progress(self): log = """ 17/02/07 18:26:27 INFO log.PerfLogger: 17/02/07 18:26:27 INFO log.PerfLogger: - """ - self.assertEquals(0, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals( + 0, HiveEngineSpec.progress(log)) def test_number_of_jobs_progress(self): log = """ 17/02/07 19:15:55 INFO ql.Driver: Total jobs = 2 - """ - self.assertEquals(0, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(0, HiveEngineSpec.progress(log)) def test_job_1_launched_progress(self): log = """ 17/02/07 19:15:55 INFO ql.Driver: Total jobs = 2 17/02/07 19:15:55 INFO ql.Driver: Launching Job 1 out of 2 - """ - self.assertEquals(0, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(0, HiveEngineSpec.progress(log)) def test_job_1_launched_stage_1_0_progress(self): log = """ 17/02/07 19:15:55 INFO ql.Driver: Total jobs = 2 17/02/07 19:15:55 INFO ql.Driver: Launching Job 1 out of 2 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 0%, reduce = 0% - """ - self.assertEquals(0, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(0, HiveEngineSpec.progress(log)) def test_job_1_launched_stage_1_map_40_progress(self): log = """ @@ -50,8 +52,8 @@ def test_job_1_launched_stage_1_map_40_progress(self): 17/02/07 19:15:55 INFO ql.Driver: Launching Job 1 out of 2 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 0%, reduce = 0% 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 40%, reduce = 0% - """ - self.assertEquals(10, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(10, HiveEngineSpec.progress(log)) def test_job_1_launched_stage_1_map_80_reduce_40_progress(self): log = """ @@ -60,8 +62,8 @@ def test_job_1_launched_stage_1_map_80_reduce_40_progress(self): 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 0%, reduce = 0% 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 40%, reduce = 0% 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 80%, reduce = 40% - """ - self.assertEquals(30, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(30, HiveEngineSpec.progress(log)) def test_job_1_launched_stage_2_stages_progress(self): log = """ @@ -72,8 +74,8 @@ def test_job_1_launched_stage_2_stages_progress(self): 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 80%, reduce = 40% 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-2 map = 0%, reduce = 0% 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 100%, reduce = 0% - """ - self.assertEquals(12, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(12, HiveEngineSpec.progress(log)) def test_job_2_launched_stage_2_stages_progress(self): log = """ @@ -83,5 +85,5 @@ def test_job_2_launched_stage_2_stages_progress(self): 17/02/07 19:15:55 INFO ql.Driver: Launching Job 2 out of 2 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 0%, reduce = 0% 17/02/07 19:16:09 INFO exec.Task: 2017-02-07 19:16:09,173 Stage-1 map = 40%, reduce = 0% - """ - self.assertEquals(60, db_engine_specs.HiveEngineSpec.progress(log)) + """.split('\n') + self.assertEquals(60, HiveEngineSpec.progress(log)) diff --git a/tests/sqllab_tests.py b/tests/sqllab_tests.py index 9e59adc7dd952..c3f2e9e20253f 100644 --- a/tests/sqllab_tests.py +++ b/tests/sqllab_tests.py @@ -186,8 +186,8 @@ def test_search_query_on_time(self): .filter_by(sql='SELECT * FROM ab_permission').one() ).start_time # Test search queries on time filter - from_time = 'from={}'.format(int(first_query_time)) - to_time = 'to={}'.format(int(second_query_time)) + from_time = 'from={}'.format(int(first_query_time)-1) + to_time = 'to={}'.format(int(second_query_time)+1) params = [from_time, to_time] resp = self.get_resp('/superset/search_queries?'+'&'.join(params)) data = json.loads(resp)