[SCM] ci-tooling packaging branch, master, updated. 7d140b743463412cf3f447ec872473ce51319ca7

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 7d140b743463412cf3f447ec872473ce51319ca7
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jan 14 15:13:43 2016 +0100

    update test data
---
 lib/projects.rb                                      | 2 +-
 test/data/test_projects/test_custom_ci/projects.json | 4 ++--
 test/test_projects.rb                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/projects.rb b/lib/projects.rb
index 7a6fb24..ef0a40d 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -256,7 +256,7 @@ class ProjectFactory
         # Create actual Project instances.
         repos.each do |repo|
           begin
-            ret << Project.new(repo, custom_ci['org'], custom_ci['git_host'],
+            ret << Project.new(repo, custom_ci['org'] || '', custom_ci['git_host'],
                                type: type)
           rescue Project::Error
           end
diff --git a/test/data/test_projects/test_custom_ci/projects.json b/test/data/test_projects/test_custom_ci/projects.json
index 887fe59..a218017 100644
--- a/test/data/test_projects/test_custom_ci/projects.json
+++ b/test/data/test_projects/test_custom_ci/projects.json
@@ -9,10 +9,10 @@
         },
         {
           "type" : "neon",
-          "org"  : "",
+          "git_host":  "git://packaging.neon.kde.org.uk",
           "repos" : [
             "neon-seeds"
           ]
         }
-    ]        
+    ]
 }
diff --git a/test/test_projects.rb b/test/test_projects.rb
index c36eee5..0612c7a 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -214,7 +214,7 @@ class ProjectTest < TestCase
     assert_equal('neon-seeds', pro.name)
     assert_equal('', pro.component)
     assert_equal('git', pro.packaging_scm.type)
-    assert_equal("git://packaging.neon.kde.org.uk/neon-seeds", pro.packaging_scm.url)
+    assert_equal('git://packaging.neon.kde.org.uk/neon-seeds', pro.packaging_scm.url)
     assert_equal('kubuntu_unstable', pro.packaging_scm.branch)
   ensure
     Project.default_url = Project::DEFAULT_URL

-- 
ci-tooling packaging