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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit c835947e216ef9d4b6e2005e1850a73c8c43b9b9
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 17 10:52:46 2015 +0100

    update apt testing to expect apt-get calls
---
 .../test_missing_modules/system_sequence           | 28 +++++++++++-----------
 test/test_apt.rb                                   |  2 +-
 test/test_qml_dependency_verifier.rb               |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence b/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
index cc6cfd3..daf0584 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
@@ -1,24 +1,24 @@
 [
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","kdeplasma-addons-data=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","kdeplasma-addons-data"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","kdeplasma-addons-data=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","kdeplasma-addons-data"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","kwin-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","kwin-addons"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","kwin-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","kwin-addons"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-dataengines-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-dataengines-addons"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-dataengines-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-dataengines-addons"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-runners-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-runners-addons"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-runners-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-runners-addons"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-wallpapers-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-wallpapers-addons"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-wallpapers-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-wallpapers-addons"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-widget-kimpanel=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-widget-kimpanel"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-widget-kimpanel=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-widget-kimpanel"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-widgets-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-widgets-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
 ["dpkg -s plasma-framework 2>&1 > /dev/null"],
-["apt","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"],
+["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"],
 ["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"]
 ]
diff --git a/test/test_apt.rb b/test/test_apt.rb
index 360500c..8da852e 100644
--- a/test/test_apt.rb
+++ b/test/test_apt.rb
@@ -19,7 +19,7 @@ class AptTest < Test::Unit::TestCase
     end
   end
 
-  def default_args(cmd = 'apt')
+  def default_args(cmd = 'apt-get')
     [cmd] + %w(--force-yes -y -o Debug::pkgProblemResolver=true)
   end
 
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index 096a963..7efca16 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -68,9 +68,9 @@ class QMLDependencyVerifierTest < Test::Unit::TestCase
   end
 
   def test_add_ppa
-    assert_system([%w(apt --force-yes -y -o Debug::pkgProblemResolver=true install software-properties-common),
+    assert_system([%w(apt-get --force-yes -y -o Debug::pkgProblemResolver=true install software-properties-common),
                    %w(add-apt-repository ppa:kubuntu-ci/unstable),
-                   %w(apt --force-yes -y -o Debug::pkgProblemResolver=true update)]) do
+                   %w(apt-get --force-yes -y -o Debug::pkgProblemResolver=true update)]) do
       QMLDependencyVerifier.new.add_ppa
     end
   end

-- 
ci-tooling packaging