[Libreoffice-commits] core.git: 3 commits - solenv/gbuild uitest/calc_tests

[Markus Mohrhard]

 solenv/gbuild/Module.mk           |    2 +-
 uitest/calc_tests/create_chart.py |    2 --
 uitest/calc_tests/edit_chart.py   |    1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e7655fbd2bba02ae22fafaa82cc4b2b163ee91c0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 1 02:39:47 2017 +0100

    let the top level uicheck depend on the build
    
    Change-Id: I3dbbf84af75fd5ec3598302252ee1103bb9d5596

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 6af2b5c..dd159a74 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -471,7 +471,7 @@ screenshot : $$(firstword $$(gb_Module_SCREENSHOTTARGETSTACK))
 subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
 stagingcheck : $$(firstword $$(gb_Module_STAGINGCHECKTARGETSTACK))
 perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK))
-uicheck : $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
+uicheck : build $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
 clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
 
 ifneq ($$(words $$(gb_Module_TARGETSTACK)),1)
commit aa5241dfd6d56ad64703767f48cacb5dc2a9ecd9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 1 01:13:28 2017 +0100

    uitest: enable additional chart tests that seem to be stable now
    
    Change-Id: I9a41c29807cc47f570a9057435386e519a438289

diff --git a/uitest/calc_tests/create_chart.py b/uitest/calc_tests/create_chart.py
index 427b4ce..5b97199 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -103,7 +103,6 @@ class CalcChartUIDemo(UITestCase):
 
         self.ui_test.close_doc()
 
-    @unittest.skip("linux deadlock")
     def test_activate_chart(self):
 
         self.ui_test.create_doc_in_start_center("calc")
@@ -129,7 +128,6 @@ class CalcChartUIDemo(UITestCase):
 
         self.ui_test.close_doc()
 
-    @unittest.skip("linux deadlock")
     def select_chart_element(self):
 
         self.ui_test.create_doc_in_start_center("calc")
commit fb090555c93715a05d58ddec7757ebec39a83696
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 1 00:14:39 2017 +0100

    uitest: the new code allows to enable the chart test again
    
    Change-Id: I51ff48441d07c12f8019d282ab92f1835cec69cb

diff --git a/uitest/calc_tests/edit_chart.py b/uitest/calc_tests/edit_chart.py
index 4d44d52..d74a8c2 100644
--- a/uitest/calc_tests/edit_chart.py
+++ b/uitest/calc_tests/edit_chart.py
@@ -27,7 +27,6 @@ class CalcChartEditUIDemo(UITestCase):
 
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C2"}))
 
-    @unittest.skip("deadlock in the chart/embbedobj code")
     def test_select_secondary_axis(self):
 
         self.ui_test.create_doc_in_start_center("calc")