Merge lp:~wilhelm-hedman/texttest/texttest into lp:texttest

[Emily Bache]

Useful bugfixes

#1597207 - partial fix, some of the tests failed on ubuntu 16.04 because we were running with a swedish locale. This fixes that at least, although other failures remain.

The other useful fix is for git move when the path contains symlinks.

[lp:~wilhelm-hedman/texttest/texttest]

5482. By Wilhelm Hedman on 2016-08-04

Added functionality to view uncollated PDFs

5483. By Wilhelm Hedman on 2016-08-04

Merge branches

[Geoff Bache (geoff.bache)]

Thanks for these! Apologies for delay, arrived when I was on holiday and then forgot about it...

1) The Git fix is very useful, I've merged that now.
2) The locale changes need to be done in the tests, we have various mechanisms for that. I'll look into it, but it's usually not a good idea to hardcode a locale in application code.
3) The viewing uncollated files functionality seems likely to be useful: however it's unfortunate that it assumes PDF. It should handle any file and use "view_program" (no need for a new config entry) to plug in a PDF viewer or whatever else. So that one needs some more work I think.

Unmerged revisions

5483. By Wilhelm Hedman on 2016-08-04

Merge branches

5482. By Wilhelm Hedman on 2016-08-04

Added functionality to view uncollated PDFs

5481. By Wilhelm Hedman on 2016-07-01

Fixed shebang path

=== modified file 'bin/texttest'
--- bin/texttest	2014-09-02 11:48:16 +0000
+++ bin/texttest	2016-08-04 07:44:03 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 import sys, os
 
@@ -34,3 +34,7 @@
     sys.stderr.write("Could not start TextTest due to Python version problems :\n" + \
                      "TextTest " + texttest_version.version + " requires at least Python " + \
                      reqVersion + ": found version " + strVersion + ".\n")
+
+
+import locale
+locale.setlocale(locale.LC_ALL, "en_US.UTF-8")
\ No newline at end of file

=== modified file 'texttestlib/default/__init__.py'
--- texttestlib/default/__init__.py	2015-02-20 11:13:19 +0000
+++ texttestlib/default/__init__.py	2016-08-04 07:44:03 +0000
@@ -1335,6 +1335,7 @@
         app.setConfigDefault("max_file_size", { "default": "-1" }, "The maximum file size to load into external programs, in bytes. -1 means no limit.")
         app.setConfigDefault("text_diff_program_filters", { "default" : [], "diff" : [ "^<", "^>" ]}, "Filters that should be applied for particular diff tools to aid with grouping in dynamic GUI")
         app.setConfigDefault("diff_program", { "default": "tkdiff" }, "External program to use for graphical file comparison")
+        app.setConfigDefault("pdf_view_program", { "default": "zathura" }, "External program to use for viewing PDF files")
         app.setConfigDefault("view_program", { "default": self.defaultViewProgram(homeOS) },  \
                               "External program(s) to use for viewing and editing text files")
         app.setConfigDefault("view_file_on_remote_machine", { "default" : 0 }, "Do we try to start viewing programs on the test execution machine?")

=== modified file 'texttestlib/default/batch/junitreport.py'
--- texttestlib/default/batch/junitreport.py	2015-10-09 13:08:04 +0000
+++ texttestlib/default/batch/junitreport.py	2016-08-04 07:44:03 +0000
@@ -58,13 +58,16 @@
                       suite_name=self._suiteName(test),
                       encoding=getpreferredencoding(),
                       time=str(t))
+
         if not test.state.hasResults():
             self._error(test, result)
         elif test.state.hasSucceeded():
             self._success(result)
+        elif not test.state.hasSucceeded() and test.state.getTypeBreakdown()[0] == "success":
+            self._success(result)
         else:
             self._failure(test, result)
-        
+
         self.testResults[test.getRelPath().replace("/", ".")] = result
         
     def getResults(self):

=== modified file 'texttestlib/default/gtkgui/default_gui/fileviewers.py'
--- texttestlib/default/gtkgui/default_gui/fileviewers.py	2014-09-18 12:32:33 +0000
+++ texttestlib/default/gtkgui/default_gui/fileviewers.py	2016-08-04 07:44:03 +0000
@@ -2,6 +2,7 @@
 """
 The various classes that launch external programs to view files
 """
+from collections import OrderedDict
 
 import os
 from texttestlib import plugins
@@ -188,7 +189,7 @@
         checkOutput = cmdArgs[0] == "storytext_editor"
         self.startViewer(cmdArgs, description=description, checkOutput=checkOutput, env=env,
                          exitHandler=exitHandler, exitHandlerArgs=exitHandlerArgs)
-        
+
     def getViewerEnvironment(self, cmdArgs):
         # An absolute path to the viewer may indicate a custom tool, send the test environment along too
         # Doing this is unlikely to cause harm in any case
@@ -264,7 +265,6 @@
             if suite.app is app:
                 return suite
 
-
 class ViewTestFileInEditor(ViewInEditor):
     def _getTitle(self):
         return "View File"
@@ -359,6 +359,43 @@
     def isActiveForFile(self, fileName, comparison):
         return ViewFilteredTestFileInEditor.isActiveForFile(self, fileName, comparison) and \
                self.unorderedFiltersActive(comparison)
+
+
+class ViewOriginalPDF(FileViewAction):
+    def _getTitle(self):
+        return "View Original PDF"
+
+    def getViewToolName(self, *args):
+        return self.getConfigValue(self.getToolConfigEntry(), "default")
+
+    def getToolConfigEntry(self):
+        return "pdf_view_program"
+
+    def getToolDescription(self):
+        return "PDF viewing program"
+
+    def viewFile(self, viewTool, fileName):
+        fileName = self.get_path()
+        self.startViewer([viewTool, fileName], description=viewTool)
+
+    def _performOnFile(self, viewTool, fileName, *args):
+        return self.viewFile(viewTool, fileName)
+
+    def get_path(self):
+        from texttestlib.default.sandbox import CollateFiles
+        collate_files = CollateFiles()
+        expanded_collations = collate_files.expandCollations(self.currTestSelection[0])
+        current_test = self.currFileSelection[0][1]
+        for stem, test_file in expanded_collations:
+            if stem == current_test.stem:
+                return test_file[0]
+        return None
+
+    def isActiveForFile(self, fileName, *args):
+        if fileName and not os.path.isdir(fileName):
+            pdf_path = self.get_path()
+            return pdf_path and ".pdf" in pdf_path
+        return False
     
 
 class ViewFilteredOrigFileInEditor(ViewFilteredTestFileInEditor):
@@ -454,6 +491,8 @@
         return "View Raw Differences (between tests)"
 
 
+
+
 class ViewFilteredFileDifferences(ViewFileDifferences):
     def _getTitle(self):
         return "View Differences"
@@ -592,7 +631,7 @@
 def getInteractiveActionClasses(dynamic):
     classes = [ ViewTestFileInEditor, EditTestFileInEditor]
     if dynamic:
-        classes += [ ViewFilteredTestFileInEditor, ViewContentFilteredTestFileInEditor,
+        classes += [ ViewFilteredTestFileInEditor, ViewContentFilteredTestFileInEditor, ViewOriginalPDF,
                      ViewOrigFileInEditor, EditOrigFileInEditor, ViewContentFilteredOrigFileInEditor, ViewFilteredOrigFileInEditor,
                      ViewFileDifferences, ViewContentFilteredFileDifferences, ViewFilteredFileDifferences,
                      ViewPairwiseDifferences, ViewContentFilteredPairwiseDifferences, ViewFilteredPairwiseDifferences,

=== modified file 'texttestlib/default/gtkgui/version_control/git.py'
--- texttestlib/default/gtkgui/version_control/git.py	2014-10-10 15:26:23 +0000
+++ texttestlib/default/gtkgui/version_control/git.py	2016-08-04 07:44:03 +0000
@@ -29,8 +29,10 @@
         vcs_independent.VersionControlInterface.startGUIProcess(self, relArgs, **kw)
 
     def parseDateTime(self, input):
+        import locale
+        locale.setlocale(locale.LC_ALL, "en_US.UTF-8")
         return time.strptime(input, "%b %d %H:%M:%S %Y")
-    
+
     def getStateFromStatus(self, output):
         words = output.split()
         if len(words) > 0:
@@ -69,8 +71,7 @@
     
     def callProgram(self, cmdName, fileArgs=[], **kwargs):
         if fileArgs:
-            # Only switch the first argument, otherwise gets difficult to capture
-            fileArgs = [ self.makeRelPath(fileArgs[0]) ] + map(os.path.realpath, fileArgs[1:])
+            fileArgs = map(os.path.realpath, fileArgs)
         return vcs_independent.VersionControlInterface.callProgram(self, cmdName, fileArgs, cwd=self.vcsDirectory, **kwargs)
 
     def getCombinedRevisionOptions(self, r1, r2):

=== modified file 'texttestlib/etc/default_gui-dynamic.xml'
--- texttestlib/etc/default_gui-dynamic.xml	2014-11-11 08:51:59 +0000
+++ texttestlib/etc/default_gui-dynamic.xml	2016-08-04 07:44:03 +0000
@@ -67,6 +67,7 @@
     <menuitem action="View Original File"/>
     <placeholder name="ExtraOrigViewers" />
     <menuitem action="View Filtered Original File"/>
+    <menuitem action="View Original PDF"/>
     <separator/>
     <menuitem action="View Differences"/>
     <placeholder name="ExtraDiffViewers" />

=== modified file 'texttestlib/etc/default_gui.uimap'
--- texttestlib/etc/default_gui.uimap	2014-11-28 14:04:01 +0000
+++ texttestlib/etc/default_gui.uimap	2016-08-04 07:44:03 +0000
@@ -112,6 +112,9 @@
 [Name=View File]
 activate = view file
 
+[Name=View Original PDF]
+activate = view original PDF
+
 [Name=View In Editor]
 activate = view in editor
 
@@ -330,7 +333,7 @@
 [Name=View Filtered Original File]
 activate = view filtered original file
 
-[Name=View Raw Differences]
+[Name=View Raw Differencess]
 activate = view raw differences
 
 [Name=View Content-Filtered Differences]