[SCM] ci-tooling packaging branch, master, updated. 5a41287d646116967bc2978c7694418eba70b4d4
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Oct 8 09:05:25 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=5a41287
The following commit has been merged in the master branch:
commit 5a41287d646116967bc2978c7694418eba70b4d4
Author: Harald Sitter <sitter at kde.org>
Date: Thu Oct 8 11:03:51 2015 +0200
add failure test to kcibuilder symbols testing
these should fail on trying to chdir packaging should an error condition
check break in kcibuilder
somewhat implicit, but meh, I have a feeling like this code will get redone
entirely at some point. way too fragile
---
.../debian/changelog | 1 +
.../test_update_symbols_parse_fail/log | 15 +++++
.../debian/changelog | 1 +
.../test_update_symbols_retraction/log | 64 ++++++++++++++++++++++
test/test_kci_builder.rb | 26 +++++++--
5 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/test/data/test_kci_builder/test_update_symbols_parse_fail/debian/changelog b/test/data/test_kci_builder/test_update_symbols_parse_fail/debian/changelog
new file mode 120000
index 0000000..fc5a745
--- /dev/null
+++ b/test/data/test_kci_builder/test_update_symbols_parse_fail/debian/changelog
@@ -0,0 +1 @@
+/home/me/src/git/pangea-tooling/ci-tooling/test/data/test_kci_builder/test_update_symbols/debian/changelog
\ No newline at end of file
diff --git a/test/data/test_kci_builder/test_update_symbols_parse_fail/log b/test/data/test_kci_builder/test_update_symbols_parse_fail/log
new file mode 100644
index 0000000..03553ea
--- /dev/null
+++ b/test/data/test_kci_builder/test_update_symbols_parse_fail/log
@@ -0,0 +1,15 @@
+dh_strip debug symbol extraction: not enabling -a because /CurrentlyBuilding exists
+dh_strip debug symbol extraction: not doing anything since NO_PKG_MANGLE is given
+make[2]: Leaving directory '/«BUILDDIR»/kdepimlibs-15.08.1+git20150917.2243+15.10'
+# Running override target (override_dh_makeshlibs)
+test -z "`ls debian/*.debhelper.log 2>/dev/null`" || sed -i '/^override_dh_makeshlibs[[:space:]]/d' debian/*.debhelper.log
+/usr/bin/make -f debian/rules override_dh_makeshlibs DH_INTERNAL_OVERRIDE="dh_makeshlibs"
+make[2]: Entering directory '/«BUILDDIR»/kdepimlibs-15.08.1+git20150917.2243+15.10'
+dh_makeshlibs '-Xusr/lib/libkdeinit5_*' -Xkcm_akonadicontact_actions.so -Xakonadi_serializer_socialfeeditem.so
+dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
+dpkg-gensymbols: warning: debian/libkf5akonadicore5/DEBIAN/symbols doesn't match completely debian/libkf5akonadicore5.symbols
+dh_shlibdeps
+dh_installdeb
+dh_sameversiondep
+dh_gencontrol
+dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe
diff --git a/test/data/test_kci_builder/test_update_symbols_retraction/debian/changelog b/test/data/test_kci_builder/test_update_symbols_retraction/debian/changelog
new file mode 120000
index 0000000..e8577b9
--- /dev/null
+++ b/test/data/test_kci_builder/test_update_symbols_retraction/debian/changelog
@@ -0,0 +1 @@
+../../test_update_symbols/debian/changelog
\ No newline at end of file
diff --git a/test/data/test_kci_builder/test_update_symbols_retraction/log b/test/data/test_kci_builder/test_update_symbols_retraction/log
new file mode 100644
index 0000000..610449d
--- /dev/null
+++ b/test/data/test_kci_builder/test_update_symbols_retraction/log
@@ -0,0 +1,64 @@
+dh_strip --dbg-package=libkf5blog-dbg
+dh_strip debug symbol extraction: disabling for PPA build
+dh_strip debug symbol extraction: not enabling -a because /CurrentlyBuilding exists
+dh_strip debug symbol extraction: not doing anything since NO_PKG_MANGLE is given
+make[2]: Leaving directory '/«BUILDDIR»/kblog-15.08.1+git20150917.2210+15.10'
+dh_makeshlibs '-Xusr/lib/libkdeinit5_*'
+dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
+dpkg-gensymbols: warning: some symbols or patterns disappeared in the symbols file: see diff output below
+dpkg-gensymbols: warning: debian/libkf5blog5/DEBIAN/symbols doesn't match completely debian/libkf5blog5.symbols
+--- debian/libkf5blog5.symbols (libkf5blog5_4:15.08.1+git20150917.2210+15.10-0_amd64)
++++ dpkg-gensymbolsGdaD_h 2015-09-17 22:15:39.646939095 +0000
+@@ -15,8 +15,10 @@
+ _ZN5KBlog10MetaWeblogD2Ev at Base 15.07.90
+ _ZN5KBlog11BlogComment10setContentERK7QString at Base 15.07.90
+ _ZN5KBlog11BlogComment12setCommentIdERK7QString at Base 15.07.90
+- _ZN5KBlog11BlogComment19setCreationDateTimeERK9KDateTime at Base 15.07.90
+- _ZN5KBlog11BlogComment23setModificationDateTimeERK9KDateTime at Base 15.07.90
++#MISSING: 4:15.08.1+git20150917.2210+15.10-0# _ZN5KBlog11BlogComment19setCreationDateTimeERK9KDateTime at Base 15.07.90
++ _ZN5KBlog11BlogComment19setCreationDateTimeERK9QDateTime at Base 4:15.08.1+git20150917.2210+15.10-0
++#MISSING: 4:15.08.1+git20150917.2210+15.10-0# _ZN5KBlog11BlogComment23setModificationDateTimeERK9KDateTime at Base 15.07.90
++ _ZN5KBlog11BlogComment23setModificationDateTimeERK9QDateTime at Base 4:15.08.1+git20150917.2210+15.10-0
+ _ZN5KBlog11BlogComment6setUrlERK4QUrl at Base 15.07.90
+ _ZN5KBlog11BlogComment7setNameERK7QString at Base 15.07.90
+ _ZN5KBlog11BlogComment8setEmailERK7QString at Base 15.07.90
+@@ -66,7 +68,8 @@
+ _ZN5KBlog4Blog11qt_metacastEPKc at Base 15.07.90
+ _ZN5KBlog4Blog11removedPostEPNS_8BlogPostE at Base 15.07.90
+ _ZN5KBlog4Blog11setPasswordERK7QString at Base 15.07.90
+- _ZN5KBlog4Blog11setTimeZoneERK9KTimeZone at Base 15.07.90
++#MISSING: 4:15.08.1+git20150917.2210+15.10-0# _ZN5KBlog4Blog11setTimeZoneERK9KTimeZone at Base 15.07.90
++ _ZN5KBlog4Blog11setTimeZoneERK9QTimeZone at Base 4:15.08.1+git20150917.2210+15.10-0
+ _ZN5KBlog4Blog11setUsernameERK7QString at Base 15.07.90
+ _ZN5KBlog4Blog12errorCommentENS0_9ErrorTypeERK7QStringPNS_8BlogPostEPNS_11BlogCommentE at Base 15.07.90
+ _ZN5KBlog4Blog12modifiedPostEPNS_8BlogPostE at Base 15.07.90
+@@ -101,7 +104,8 @@
+ _ZN5KBlog5GData14listedCommentsEPNS_8BlogPostERK5QListINS_11BlogCommentEE at Base 15.07.90
+ _ZN5KBlog5GData14removedCommentEPKNS_8BlogPostEPKNS_11BlogCommentE at Base 15.07.90
+ _ZN5KBlog5GData15listAllCommentsEv at Base 15.07.90
+- _ZN5KBlog5GData15listRecentPostsERK11QStringListiRK9KDateTimeS6_S6_S6_ at Base 15.07.90
++#MISSING: 4:15.08.1+git20150917.2210+15.10-0# _ZN5KBlog5GData15listRecentPostsERK11QStringListiRK9KDateTimeS6_S6_S6_ at Base 15.07.90
++ _ZN5KBlog5GData15listRecentPostsERK11QStringListiRK9QDateTimeS6_S6_S6_ at Base 4:15.08.1+git20150917.2210+15.10-0
+ _ZN5KBlog5GData15listRecentPostsEi at Base 15.07.90
+ _ZN5KBlog5GData16fetchedProfileIdERK7QString at Base 15.07.90
+ _ZN5KBlog5GData16staticMetaObjectE at Base 15.07.90
+@@ -118,10 +122,12 @@
+ _ZN5KBlog8BlogPost10setSummaryERK7QString at Base 15.07.90
+ _ZN5KBlog8BlogPost13setCategoriesERK11QStringList at Base 15.07.90
+ _ZN5KBlog8BlogPost17setCommentAllowedEb at Base 15.07.90
+- _ZN5KBlog8BlogPost19setCreationDateTimeERK9KDateTime at Base 15.07.90
++#MISSING: 4:15.08.1+git20150917.2210+15.10-0# _ZN5KBlog8BlogPost19setCreationDateTimeERK9KDateTime at Base 15.07.90
++ _ZN5KBlog8BlogPost19setCreationDateTimeERK9QDateTime at Base 4:15.08.1+git20150917.2210+15.10-0
+ _ZN5KBlog8BlogPost19setTrackBackAllowedEb at Base 15.07.90
+ _ZN5KBlog8BlogPost20setAdditionalContentERK7QString at Base 15.07.90
+- _ZN5KBlog8BlogPost23setModificationDateTimeERK9KDateTime at Base 15.07.90
++#MISSING: 4:15.08.1+git20150917.2210+15.10-0# _ZN5KBlog8BlogPost23setModificationDateTimeERK9KDateTime at Base 15.07.90
++ _ZN5KBlog8BlogPost23setModificationDateTimeERK9QDateTime at Base 4:15.08.1+git20150917.2210+15.10-0
+ _ZN5KBlog8BlogPost7setMoodERK7QString at Base 15.07.90
+ _ZN5KBlog8BlogPost7setSlugERK7QString at Base 15.07.90
+ _ZN5KBlog8BlogPost7setTagsERK11QStringList at Base 15.07.90
+dh_makeshlibs: failing due to earlier errors
+/usr/share/pkg-kde-tools/qt-kde-team/3/dhmk.mk:97: recipe for target 'pre_binary_dh_makeshlibs' failed
+make[1]: *** [pre_binary_dh_makeshlibs] Error 2
+make[1]: Leaving directory '/«BUILDDIR»/kblog-15.08.1+git20150917.2210+15.10'
+/usr/share/pkg-kde-tools/qt-kde-team/3/dhmk.mk:112: recipe for target 'debian/dhmk_binary' failed
\ No newline at end of file
diff --git a/test/test_kci_builder.rb b/test/test_kci_builder.rb
index bece370..213eb54 100644
--- a/test/test_kci_builder.rb
+++ b/test/test_kci_builder.rb
@@ -68,8 +68,7 @@ class KCIBuilderTest < TestCase
end
end
- def test_update_symbols
- # Setup vars
+ def symbols_data
log_data = File.read(data('log'))
logs = [data('log')]
architectures_with_log = ['amd64']
@@ -80,7 +79,10 @@ class KCIBuilderTest < TestCase
s.type = nil
s.build_version = CI::BuildVersion.new(Changelog.new(data))
end
+ [log_data, logs, architectures_with_log, project, source]
+ end
+ def test_update_symbols
# Setup our remote and packaging dir
Dir.mkdir('remote')
Dir.chdir('remote') do
@@ -94,8 +96,7 @@ class KCIBuilderTest < TestCase
# Actual run
fake_home do
- KCIBuilder.update_symbols(log_data, logs, architectures_with_log, project,
- source)
+ KCIBuilder.update_symbols(*symbols_data)
end
Dir.chdir('packaging') do
@@ -105,4 +106,21 @@ class KCIBuilderTest < TestCase
File.read('debian/libkf5akonadicore5.symbols'))
end
end
+
+ def test_update_symbols_retraction
+ # This would fail on missing git clone, symbols files if it tried to meddle
+ # with symbols actually.
+ # It should return without doing anything otherwise.
+ fake_home do
+ KCIBuilder.update_symbols(*symbols_data)
+ end
+ end
+
+ def test_update_symbols_parse_fail
+ # Would fail like test_update_symbols_retraction if error condition is
+ # not met.
+ fake_home do
+ KCIBuilder.update_symbols(*symbols_data)
+ end
+ end
end
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list