diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-03 06:26:58 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-03 06:26:58 +0200 | 
| commit | 27b47b5db42407baf5d704bf52c35015b2c0ad7b (patch) | |
| tree | 320f8d5fc315c211f7d073891bd7117754f5f5b3 /QMTest/scons_tdb.py | |
| parent | 6be31f5d140b81227911cabfc61d3802c76c1b61 (diff) | |
| parent | fabd454ddf505302bf41ef4da0609437c29d5605 (diff) | |
Merge branch 'release/3.0.0+repack-1'3.0.0+repack-1
Diffstat (limited to 'QMTest/scons_tdb.py')
| -rw-r--r-- | QMTest/scons_tdb.py | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py index 18e6a59..c3b082f 100644 --- a/QMTest/scons_tdb.py +++ b/QMTest/scons_tdb.py @@ -1,6 +1,6 @@  #!/usr/bin/env python  # -# Copyright (c) 2001 - 2016 The SCons Foundation +# Copyright (c) 2001 - 2017 The SCons Foundation  #  # Permission is hereby granted, free of charge, to any person obtaining  # a copy of this software and associated documentation files (the @@ -20,7 +20,7 @@  # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -from __future__ import division +from __future__ import division, print_function  """  QMTest classes to support SCons' testing and Aegis-inspired workflow. @@ -28,7 +28,7 @@ QMTest classes to support SCons' testing and Aegis-inspired workflow.  Thanks to Stefan Seefeld for the initial code.  """ -__revision__ = "QMTest/scons_tdb.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" +__revision__ = "QMTest/scons_tdb.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"  ########################################################################  # Imports @@ -337,14 +337,14 @@ class AegisChangeStream(AegisStream):              # We'd like to use the _FormatStatistics() method to do              # this, but it's wrapped around the list in Result.outcomes,              # so it's simpler to just do it ourselves. -            print "  %6d        tests total\n" % self._num_tests +            print("  %6d        tests total\n" % self._num_tests)              for outcome in AegisTest.aegis_outcomes:                  if self._outcome_counts[outcome] != 0: -                    print "  %6d (%3.0f%%) tests %s" % ( +                    print("  %6d (%3.0f%%) tests %s" % (                          self._outcome_counts[outcome],                          self._percent(outcome),                          outcome -                    ) +                    ))  class AegisBaselineStream(AegisStream):      def WriteResult(self, result): @@ -368,19 +368,19 @@ class AegisBaselineStream(AegisStream):              # this, but it's wrapped around the list in Result.outcomes,              # so it's simpler to just do it ourselves.              if self._outcome_counts[AegisTest.FAIL]: -                print "  %6d (%3.0f%%) tests as expected" % ( +                print("  %6d (%3.0f%%) tests as expected" % (                      self._outcome_counts[AegisTest.FAIL],                      self._percent(AegisTest.FAIL), -                ) +                ))              non_fail_outcomes = list(AegisTest.aegis_outcomes[:])              non_fail_outcomes.remove(AegisTest.FAIL)              for outcome in non_fail_outcomes:                  if self._outcome_counts[outcome] != 0: -                    print "  %6d (%3.0f%%) tests unexpected %s" % ( +                    print("  %6d (%3.0f%%) tests unexpected %s" % (                          self._outcome_counts[outcome],                          self._percent(outcome),                          outcome, -                    ) +                    ))  class AegisBatchStream(FileResultStream):      def __init__(self, arguments):  | 
