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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit f7510c0d6591c1ba094911c0eea915852791f9fd
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 12 12:03:50 2015 +0200

    reset apt::repo before tests that use it so that they can expect installs
---
 test/test_apt.rb                     | 4 ++++
 test/test_qml_dependency_verifier.rb | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/test/test_apt.rb b/test/test_apt.rb
index fd6e7e2..5e90b27 100644
--- a/test/test_apt.rb
+++ b/test/test_apt.rb
@@ -6,6 +6,10 @@ require_relative 'lib/testcase'
 class AptTest < TestCase
   prepend AssertSystem
 
+  def setup
+    Apt::Repository.send(:reset)
+  end
+
   def test_repo
     repo = nil
     assert_system_default(%w(install software-properties-common)) do
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index 19bebfe..3366307 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -25,6 +25,8 @@ class QMLDependencyVerifierTest < TestCase
 
     Dir.chdir(@datadir)
     LSB.instance_variable_set(:@hash, DISTRIB_CODENAME: 'vivid')
+
+    Apt::Repository.send(:reset)
   end
 
   def teardown

-- 
ci-tooling packaging