[SCM] ci-tooling packaging branch, master, updated. 140faea23dfb80980fb6187cad3820833debca1f

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 92a9889f50f11d627a6f8b8edacf7869dede682a
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jan 15 10:59:36 2016 +0100

    split invalid custom_ci test
---
 .../{test_custom_ci => test_custom_ci_invalid}/invalid.json         | 0
 test/test_projects.rb                                               | 6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/data/test_projects/test_custom_ci/invalid.json b/test/data/test_projects/test_custom_ci_invalid/invalid.json
similarity index 100%
rename from test/data/test_projects/test_custom_ci/invalid.json
rename to test/data/test_projects/test_custom_ci_invalid/invalid.json
diff --git a/test/test_projects.rb b/test/test_projects.rb
index 8180e0f..a705160 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -193,11 +193,13 @@ class ProjectTest < TestCase
     assert_not_include(output, 'file1')
   end
 
-  def test_custom_ci
-    assert_raise RuntimeError do
+  def test_custom_ci_invalid
+    assert_raise Project::GitTransactionError do
       Projects.new(type: 'unstable', allow_custom_ci: true, projects_file: data('invalid.json'))
     end
+  end
 
+  def test_custom_ci
     projects = Projects.new(type: 'unstable', allow_custom_ci: true,
                             projects_file: data('projects.json'))
     assert_equal(2, projects.size)

-- 
ci-tooling packaging