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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Jan 7 11:14:54 UTC 2016


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

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

    change url switcheroo to use the constant
---
 test/test_projects.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/test_projects.rb b/test/test_projects.rb
index cacab5a..48f2bfa 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -158,7 +158,6 @@ class ProjectTest < TestCase
       git_init_commit(git_init_repo(r))
     end
 
-    url = Project.default_url
     Project.default_url = repos
 
     reference_projects = %w(kinfocenter gwenview qtubuntu-cameraplugin-fake)
@@ -172,7 +171,7 @@ class ProjectTest < TestCase
     end
     assert_equal(tmpref.size, 0)
   ensure
-    Project.default_url = url
+    Project.default_url = Project::DEFAULT_URL
   end
 
   def test_cleanup_uri
@@ -199,7 +198,6 @@ class ProjectTest < TestCase
     git_init_commit(git_init_repo("#{repo_base}/qt/qtx11extras"),
                     %w(master experimental))
 
-    url = Project.default_url
     Project.default_url = repo_base
 
     assert_raise RuntimeError do
@@ -218,7 +216,7 @@ class ProjectTest < TestCase
     assert_equal('tarball', pro.upstream_scm.type)
     assert_equal('http://abc+dfsg.tar.xz', pro.upstream_scm.url)
   ensure
-    Project.default_url = url
+    Project.default_url = Project::DEFAULT_URL
   end
 
   def test_launchpad

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list