[Libreoffice-commits] dev-tools.git: test-bugzilla-files/new-control.py test-bugzilla-files/test-bugzilla-files.py

[Gülşah Köse (via logerrit)]

 test-bugzilla-files/new-control.py         |    7 +++++--
 test-bugzilla-files/test-bugzilla-files.py |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d07ab8251361bdfa3d0e6cf2ccaf88dfbd5dfdb9
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Wed Sep 8 11:09:00 2021 +0300
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Sep 8 11:53:28 2021 +0200

    Extend file formats to compare with odfundiff.
    
    Before we were comparing only odt files. Now we can compare ods,
    odb, odg and odp files too.
    
    Change-Id: Id10280b67989b8c8cc919f181b205e322a1d1670
    Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/121803
    Tested-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/test-bugzilla-files/new-control.py b/test-bugzilla-files/new-control.py
index 9a56fa3..f5faa0a 100644
--- a/test-bugzilla-files/new-control.py
+++ b/test-bugzilla-files/new-control.py
@@ -54,10 +54,13 @@ def execute_task(task_file, asan):
     time.sleep(1)
 
 def saveAsPreviousState(exported_files):
-    odf_file_ext = ['odt']
+    odf_file_ext = ['odt', 'odp', 'odb', 'ods', 'odg']
     previous_path = "/srv/crashtestdata/previous"
     if os.path.exists(previous_path):
-        rmtree("/srv/crashtestdata/previous")
+        rmtree(previous_path)
+
+    for ext in odf_file_ext:
+        os.makedirs(previous_path + "/srv/crashtestdata/files/"+ ext)
 
     prefix = "/srv/crashtestdata/current"
     for file in exported_files:
diff --git a/test-bugzilla-files/test-bugzilla-files.py b/test-bugzilla-files/test-bugzilla-files.py
index 710364d..0f2d7d3 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -668,8 +668,9 @@ if __name__ == "__main__":
                 exclude_list = [line.rstrip() for line in exclude_list]
 
         if  isPreviousExist():
+            odf_file_ext = ['odt', 'odp', 'odb', 'ods', 'odg']
             for filename in exportedFiles:
-                if filename[-3:] == 'odt':
+                if filename[-3:] in odf_file_ext:
                     odfundiffCommandWithURL = getODFunDiffCommand() + " /srv/crashtestdata/previous" + filename + " /srv/crashtestdata/current" + filename
                     print(odfundiffCommandWithURL)
                     try: