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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit ab798063b02989208a7ed5f2009caef4afce82b4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Dec 3 11:17:54 2015 +0100

    transition the test back from packaging_scm_scm to packaging_scm
---
 test/test_projects.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/test_projects.rb b/test/test_projects.rb
index 0407b0b..303474f 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -86,12 +86,10 @@ class ProjectTest < TestCase
           assert_equal([], project.dependees)
           assert_equal(["kubuntu_#{stability}_yolo"], project.series_branches)
           assert_equal(false, project.autopkgtest)
-          # FIXME: this is totally inconsistent with upstream_scm
-          assert_equal("#{gitrepo}/#{component}/#{name}", project.packaging_scm)
 
-          assert_equal('git', project.packaging_scm_scm.type)
-          assert_equal("#{gitrepo}/#{component}/#{name}", project.packaging_scm_scm.url)
-          assert_equal("kubuntu_#{stability}", project.packaging_scm_scm.branch)
+          assert_equal('git', project.packaging_scm.type)
+          assert_equal("#{gitrepo}/#{component}/#{name}", project.packaging_scm.url)
+          assert_equal("kubuntu_#{stability}", project.packaging_scm.branch)
         end
       ensure
         FileUtils.rm_rf(tmpdir) unless tmpdir.nil?
@@ -212,9 +210,9 @@ class ProjectTest < TestCase
     pro = projects[0]
     assert_equal('qtx11extras', pro.name)
     assert_equal('qt', pro.component)
-    assert_equal('git', pro.packaging_scm_scm.type)
-    assert_equal("#{repo_base}/qt/qtx11extras", pro.packaging_scm_scm.url)
-    assert_equal('experimental', pro.packaging_scm_scm.branch)
+    assert_equal('git', pro.packaging_scm.type)
+    assert_equal("#{repo_base}/qt/qtx11extras", pro.packaging_scm.url)
+    assert_equal('experimental', pro.packaging_scm.branch)
     assert_equal('tarball', pro.upstream_scm.type)
     assert_equal('http://abc+dfsg.tar.xz', pro.upstream_scm.url)
   ensure

-- 
ci-tooling packaging