[SCM] ci-tooling packaging branch, master, updated. 69c3e9ac21a5b7a260ff222509782b1dc45eec00

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 69c3e9ac21a5b7a260ff222509782b1dc45eec00
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 13 14:10:09 2015 +0200

    make test pass on 14.04 by handling tar name difference
---
 test/test_ci_orig_source_builder.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/test_ci_orig_source_builder.rb b/test/test_ci_orig_source_builder.rb
index 327e0eb..fc6ce4c 100644
--- a/test/test_ci_orig_source_builder.rb
+++ b/test/test_ci_orig_source_builder.rb
@@ -27,7 +27,9 @@ module CI
 
       builder.build
 
-      assert_path_exist('build/dragon_15.08.1-0kubuntu1.debian.tar.xz')
+      # On 14.04 the default was .gz, newer versions may yield .xz
+      debian_tar = Dir.glob('build/dragon_15.08.1-0kubuntu1.debian.tar.*')
+      assert_false(debian_tar.empty?)
       assert_path_exist('build/dragon_15.08.1-0kubuntu1_source.changes')
       assert_path_exist('build/dragon_15.08.1-0kubuntu1.dsc')
       assert_path_exist('build/dragon_15.08.1.orig.tar.xz')

-- 
ci-tooling packaging