[SCM] ci-tooling packaging branch, master, updated. 9898d033e20fe2ff6c98fb0e3a830884b03a3fdd

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=211968d

The following commit has been merged in the master branch:
commit 211968d932a2af78c46dab2a4ce126453eda9aa1
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Oct 9 13:04:09 2015 +0200

    fix bug in symbol error skipping by getting an array of strings
    
    results array contains Result objects which have result types as
    Array, this of course is not where we want to check symbol revisions
    messages.
    also, results have their messages sorted by priority so we need to check
    each priority for a matching one (assuming lintian should change priority
    at some point)
---
 kci/builder.rb                        | 7 +++++--
 test/data/test_lint_lintian/test_lint | 1 +
 test/test_kci_builder.rb              | 8 +++++++-
 test/test_lint_lintian.rb             | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index e645e26..2f3d62b 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -308,8 +308,11 @@ class KCIBuilder
   def self.lint_logs(log_data, updated_symbols:)
     results = Lint::Log.new(log_data).lint
     if updated_symbols # Drop symbols error if we applied an update.
-      results.reject! do |i|
-        i.include?('symbols-file-contains-current-version-with-debian-revision')
+      results.each do |result|
+        lintian = 'symbols-file-contains-current-version-with-debian-revision'
+        result.errors.reject! { |s| s.include?(lintian) }
+        result.warnings.reject! { |s| s.include?(lintian) }
+        result.informations.reject! { |s| s.include?(lintian) }
       end
     end
     results
diff --git a/test/data/test_lint_lintian/test_lint b/test/data/test_lint_lintian/test_lint
index 504f0ac..2e2c121 100644
--- a/test/data/test_lint_lintian/test_lint
+++ b/test/data/test_lint_lintian/test_lint
@@ -14,6 +14,7 @@ W: cantor source: out-of-date-standards-version 3.9.5 (current is 3.9.6)
 W: cantor-backend-octave: package-has-long-file-name 73 (82) > 80
 W: cantor: desktop-mime-but-no-exec-code usr/share/applications/org.kde.cantor.desktop
 W: cantor: desktop-mime-but-no-exec-code usr/share/applications/org.kde.cantor.desktop1
+E: cantor: symbols-file-contains-current-version-with-debian-revision on symbol _ZN5CEGUI10ButtonBase11onMouseMoveERNS_14MouseEventArgsE at Base and 9031 others
 E: foo
 I: bar
 N: 2 tags overridden (1 error, 1 warning)
diff --git a/test/test_kci_builder.rb b/test/test_kci_builder.rb
index 882ef4e..4620a99 100644
--- a/test/test_kci_builder.rb
+++ b/test/test_kci_builder.rb
@@ -127,8 +127,14 @@ class KCIBuilderTest < TestCase
   def test_puts_log
     Dir.glob("#{data}/*/*").each do |f|
       next if File.directory?(f)
-      results = KCIBuilder.lint_logs(File.read(f), updated_symbols: false)
+      results = KCIBuilder.lint_logs(File.read(f), updated_symbols: true)
       assert_false(results.empty?)
+      results.each do |result|
+        result.all.each do |message|
+          assert_false(message.include?('symbols-file-contains-current-version-with-debian-revision'),
+                       'results include symbols error but should not')
+        end
+      end
     end
   end
 end
diff --git a/test/test_lint_lintian.rb b/test/test_lint_lintian.rb
index 005340b..5567f57 100644
--- a/test/test_lint_lintian.rb
+++ b/test/test_lint_lintian.rb
@@ -8,7 +8,7 @@ class LintLintianTest < TestCase
     assert(r.valid)
     assert_equal(2, r.informations.size)
     assert_equal(2, r.warnings.size)
-    assert_equal(1, r.errors.size)
+    assert_equal(2, r.errors.size)
   end
 
   def test_invalid

-- 
ci-tooling packaging