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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 33a8f9b1f74d5d84aa7a780a4ce710ad2f45f83c
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 7 13:18:42 2015 +0100

    add a test for versions without a suffix
---
 .../test_without_suffix}/debian/changelog                        | 2 +-
 test/test_debian_changelog.rb                                    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/data/test_ci_build_version/test_bad_version/debian/changelog b/test/data/test_debian_changelog/test_without_suffix/debian/changelog
similarity index 66%
copy from test/data/test_ci_build_version/test_bad_version/debian/changelog
copy to test/data/test_debian_changelog/test_without_suffix/debian/changelog
index 696ac0b..2149165 100644
--- a/test/data/test_ci_build_version/test_bad_version/debian/changelog
+++ b/test/data/test_debian_changelog/test_without_suffix/debian/changelog
@@ -1,4 +1,4 @@
-khelpcenter (4:abc-0ubuntu1) vivid; urgency=medium
+khelpcenter (5.2.1~git123) vivid; urgency=medium
 
   * New upstream release
 
diff --git a/test/test_debian_changelog.rb b/test/test_debian_changelog.rb
index 8c3d5bb..2b47bba 100644
--- a/test/test_debian_changelog.rb
+++ b/test/test_debian_changelog.rb
@@ -22,6 +22,15 @@ class DebianChangelogTest < TestCase
     assert_equal('5.2.1~git123-0ubuntu1', c.version(Changelog::ALL))
   end
 
+  def test_without_suffix
+    c = Changelog.new(data)
+    assert_equal('', c.version(Changelog::EPOCH))
+    assert_equal('5.2.1', c.version(Changelog::BASE))
+    assert_equal('~git123', c.version(Changelog::BASESUFFIX))
+    assert_equal('', c.version(Changelog::REVISION))
+    assert_equal('5.2.1~git123', c.version(Changelog::ALL))
+  end
+
   def test_with_suffix_and_epoch
     c = Changelog.new(data)
     assert_equal('4:', c.version(Changelog::EPOCH))

-- 
ci-tooling packaging