[SCM] ci-tooling packaging branch, master, updated. 0cfc5d0309cbd54c1c9d400fa87820b3cae0dedb

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit a5d4486dc88bbfe4f568384be48e379f4a73a04f
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Apr 29 15:11:59 2015 +0200

    make sure the qml dep verify test actually hits the ignore code path
    
    we want one module ignored, one reported missing, rest supplied.
---
 .../test_qml_dependency_verifier/test_missing_modules/main.qml    | 1 +
 test/test_qml_dependency_verifier.rb                              | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml b/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml
index cabf443..ed210b8 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml
@@ -20,6 +20,7 @@
 import QtQuick 2.0
 import QtWebKit 3.0
 import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.1
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.plasmoid 2.0 as Plasmoid
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index 518ae9b..9099a36 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'vcr'
 
 require_relative '../lib/qml_dependency_verifier'
@@ -72,6 +73,11 @@ class QMLDependencyVerifierTest < TestCase
   end
 
   def test_missing_modules
+    # Create a qml ignore file, ignoring one of the two missing modules.
+    FileUtils.mkpath('packaging/debian')
+    File.write('packaging/debian/plasma-widgets-addons.qml-ignore',
+               'QtQuick.Controls')
+    # Prepare sequences, divert search path and run verification.
     const_reset(QML, :SEARCH_PATHS, [File.join(data, 'qml')])
     system_sequence = JSON.parse(File.read(data('system_sequence')))
     backtick_sequence = JSON.parse(File.read(data('backtick_sequence')))
@@ -80,10 +86,12 @@ class QMLDependencyVerifierTest < TestCase
         missing = QMLDependencyVerifier.new.missing_modules
         assert_equal(1, missing.size, 'More things missing than expected' \
                                       " #{missing}")
+
         assert(missing.key?('plasma-widgets-addons'))
         missing = missing.fetch('plasma-widgets-addons')
         assert_equal(1, missing.size, 'More modules missing than expected' \
                      " #{missing}")
+
         missing = missing.first
         assert_equal('QtWebKit', missing.identifier)
       end

-- 
ci-tooling packaging