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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit a5d1860e6b7c009c51cf8f8f8582c6e9bed42fa7
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Oct 16 09:40:23 2015 +0200

    fake uscan http using new server
---
 .../test_watch_fetch/debian/watch                    |   3 +--
 .../test_watch_fetch/http/dragon-15.08.1.tar.xz      | Bin 0 -> 176 bytes
 test/test_ci_tar_fetcher.rb                          |  19 ++++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/data/test_ci_tar_fetcher/test_watch_fetch/debian/watch b/test/data/test_ci_tar_fetcher/test_watch_fetch/debian/watch
index 82f6410..6ae55ad 100644
--- a/test/data/test_ci_tar_fetcher/test_watch_fetch/debian/watch
+++ b/test/data/test_ci_tar_fetcher/test_watch_fetch/debian/watch
@@ -1,3 +1,2 @@
 version=3
-http://download.kde.org/stable/applications/15.08.1/src/dragon-([\d\.]*).tar.xz
-http://download.kde.org/unstable/applications/([\d\.]*)/src/dragon-([\d\.]*).tar.xz
+http://localhost:9473/dragon-([\d\.]*).tar.xz
\ No newline at end of file
diff --git a/test/data/test_ci_tar_fetcher/test_watch_fetch/http/dragon-15.08.1.tar.xz b/test/data/test_ci_tar_fetcher/test_watch_fetch/http/dragon-15.08.1.tar.xz
new file mode 100644
index 0000000..e6cea6e
Binary files /dev/null and b/test/data/test_ci_tar_fetcher/test_watch_fetch/http/dragon-15.08.1.tar.xz differ
diff --git a/test/test_ci_tar_fetcher.rb b/test/test_ci_tar_fetcher.rb
index 80a787a..a0b0bd4 100644
--- a/test/test_ci_tar_fetcher.rb
+++ b/test/test_ci_tar_fetcher.rb
@@ -1,5 +1,6 @@
 require 'vcr'
 
+require_relative 'lib/serve'
 require_relative 'lib/testcase'
 
 require_relative '../lib/ci/tar_fetcher'
@@ -46,13 +47,17 @@ module CI
         # Not a debian dir
       end
 
-      f = WatchTarFetcher.new(data('debian/watch'))
-      t = f.fetch(Dir.pwd)
-      # assert_path_exist('dragon_15.08.1.orig.tar.xz')
-      assert_equal(Tarball, t.class)
-      assert_path_exist('dragon_15.08.1.orig.tar.xz')
-      assert(t.orig?) # uscan mangles by default, we expect it like that
-      assert_equal('dragon_15.08.1.orig.tar.xz', File.basename(t.origify.path))
+      Test.http_serve(data('http')) do
+        f = WatchTarFetcher.new(data('debian/watch'))
+        t = f.fetch(Dir.pwd)
+
+        # assert_path_exist('dragon_15.08.1.orig.tar.xz')
+        assert_equal(Tarball, t.class)
+        assert_path_exist('dragon_15.08.1.orig.tar.xz')
+        assert(t.orig?) # uscan mangles by default, we expect it like that
+        assert_equal('dragon_15.08.1.orig.tar.xz',
+                     File.basename(t.origify.path))
+      end
     end
   end
 end

-- 
ci-tooling packaging