[libreoffice] 01/03: add new uitest/writer_tests/data/3pages.odt to source/include-binaries

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit e571d6778488e82ac70fc77f10858d90db8fdc8d
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 25 15:51:58 2017 +0100

    add new uitest/writer_tests/data/3pages.odt to source/include-binaries
    
    This reverts commit e96c1dc5db89d7b139bbac61d0042a7aa5a40988.
---
 changelog                                          |  2 +-
 .../disable-tests-somehow-needing-more-fonts.diff  | 47 ----------------------
 source/include-binaries                            |  1 +
 3 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/changelog b/changelog
index 25a08ff..d9a08b2 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta1~git20171124-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171120-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/disable-tests-somehow-needing-more-fonts.diff b/patches/disable-tests-somehow-needing-more-fonts.diff
index bce47c3..a78c58d 100644
--- a/patches/disable-tests-somehow-needing-more-fonts.diff
+++ b/patches/disable-tests-somehow-needing-more-fonts.diff
@@ -39,50 +39,3 @@ index d7f548dcb4de..5bd6e6a6c5e9 100644
  
      // check content of the first page
      {
-
-# WTF. This has 3 pages. No page breaks but hardcoded "enter"s until page flops
-# over". This is flaky...  odt fixed upstream in
-# https://cgit.freedesktop.org/libreoffice/core/commit/?id=b03f7cdc04f9df778e2da93eadfe1d44f7665caf
---- a/uitest/writer_tests/goToPage.py	2017-11-24 23:35:25.646075420 +0100
-+++ /dev/null	2017-11-24 23:10:03.863417381 +0100
-@@ -1,40 +0,0 @@
--#
--# This Source Code Form is subject to the terms of the Mozilla Public
--# License, v. 2.0. If a copy of the MPL was not distributed with this
--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--
--from uitest.framework import UITestCase
--from libreoffice.uno.propertyvalue import mkPropertyValues
--from uitest.uihelper.common import get_state_as_dict
--import time
--from uitest.path import get_srcdir_url
--
--def get_url_for_data_file(file_name):
--    return get_srcdir_url() + "/uitest/writer_tests/data/" + file_name
--
--class GoToPage_dialog(UITestCase):
--
--   def test_go_to_page(self):
--    writer_doc = self.ui_test.load_file(get_url_for_data_file("3pages.odt"))
--    xWriterDoc = self.xUITest.getTopFocusWindow()
--    xWriterEdit = xWriterDoc.getChild("writer_edit")
--
--    self.ui_test.execute_dialog_through_command(".uno:GotoPage")
--    xDialog = self.xUITest.getTopFocusWindow()
--    xPageText = xDialog.getChild("page")
--    xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"2"}))
--    xOkBtn = xDialog.getChild("ok")
--    xOkBtn.executeAction("CLICK", tuple())
--
--    self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "2")
--
--    self.ui_test.execute_dialog_through_command(".uno:GotoPage")
--    xDialog = self.xUITest.getTopFocusWindow()
--    xPageText = xDialog.getChild("page")
--    xPageText.executeAction("TYPE", mkPropertyValues({"TEXT":"3a"}))
--    xOkBtn = xDialog.getChild("ok")
--    xOkBtn.executeAction("CLICK", tuple())
--
--    self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "3")
--
--    self.ui_test.close_doc()
diff --git a/source/include-binaries b/source/include-binaries
index 343b412..dd22add 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,3 +5,4 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/pdfium-3235.tar.bz2
+uitest/writer_tests/data/3pages.odt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git