[SCM] ci-tooling packaging branch, master, updated. 147f3d9c426d1d083df39e92272a8cd3418ca825

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit b24f56c3181f3b5276756781e0a19c6adea80167
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Apr 30 09:55:49 2015 +0200

    revise qml ignore test file
    
    the verifier test runs with datadir as pwd so simply place the ignore there
    statically and use that
---
 .../packaging/debian/plasma-widgets-addons.qml-ignore              | 1 +
 test/test_qml_dependency_verifier.rb                               | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/data/test_qml_dependency_verifier/packaging/debian/plasma-widgets-addons.qml-ignore b/test/data/test_qml_dependency_verifier/packaging/debian/plasma-widgets-addons.qml-ignore
new file mode 100644
index 0000000..f6768ce
--- /dev/null
+++ b/test/data/test_qml_dependency_verifier/packaging/debian/plasma-widgets-addons.qml-ignore
@@ -0,0 +1 @@
+QtQuick.Controls
\ No newline at end of file
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index 9099a36..a45e88c 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -73,10 +73,9 @@ 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')
+    # Make sure our ignore is in place in the data dir.
+    # NB: this testcase is chdir in the @datadir not the @tmpdir!
+    assert(File.exist?('packaging/debian/plasma-widgets-addons.qml-ignore'))
     # 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')))

-- 
ci-tooling packaging