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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 0e3272fe4f93f2a5e9f475d4d6782a92a64b4047
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 8 10:44:55 2015 +0200

    add outcome assertation to symbol patching
---
 .../{debian => ref}/libkf5akonadiagentbase5.symbols          |  3 ++-
 .../{debian => ref}/libkf5akonadicore5.symbols               |  7 +++++--
 test/test_kci_builder.rb                                     | 12 ++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/test/data/test_kci_builder/test_update_symbols/debian/libkf5akonadiagentbase5.symbols b/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadiagentbase5.symbols
similarity index 98%
copy from test/data/test_kci_builder/test_update_symbols/debian/libkf5akonadiagentbase5.symbols
copy to test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadiagentbase5.symbols
index 284641c..4f56330 100644
--- a/test/data/test_kci_builder/test_update_symbols/debian/libkf5akonadiagentbase5.symbols
+++ b/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadiagentbase5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:15.07.90 amd64 arm64 armhf i386 ppc64el
+# SymbolsHelper-Confirmed: 4:15.08.0+git20150717.1756+15.04 amd64
 libKF5AkonadiAgentBase.so.5 libkf5akonadiagentbase5 #MINVER#
  _ZN7Akonadi12ResourceBase10cancelTaskERK7QString at Base 15.07.90
  _ZN7Akonadi12ResourceBase10cancelTaskEv at Base 15.07.90
@@ -27,6 +27,7 @@ libKF5AkonadiAgentBase.so.5 libkf5akonadiagentbase5 #MINVER#
  _ZN7Akonadi12ResourceBase18itemsRetrievalDoneEv at Base 15.07.90
  _ZN7Akonadi12ResourceBase18relationsRetrievedERK7QVectorINS_8RelationEE at Base 15.07.90
  _ZN7Akonadi12ResourceBase18scheduleCustomTaskEP7QObjectPKcRK8QVariantNS0_16SchedulePriorityE at Base 15.07.90
+ _ZN7Akonadi12ResourceBase18setItemMergingModeENS_8ItemSync9MergeModeE at Base 4:15.08.0+git20150717.1756+15.04
  _ZN7Akonadi12ResourceBase19requestItemDeliveryExRK7QStringS3_RK11QStringList at Base 15.07.90
  _ZN7Akonadi12ResourceBase20collectionsRetrievedERK7QVectorINS_10CollectionEE at Base 15.07.90
  _ZN7Akonadi12ResourceBase20setItemSyncBatchSizeEi at Base 15.07.90
diff --git a/test/data/test_kci_builder/test_update_symbols/debian/libkf5akonadicore5.symbols b/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols
similarity index 99%
copy from test/data/test_kci_builder/test_update_symbols/debian/libkf5akonadicore5.symbols
copy to test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols
index d1c3ceb..60ac460 100644
--- a/test/data/test_kci_builder/test_update_symbols/debian/libkf5akonadicore5.symbols
+++ b/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:15.08.0 amd64
+# SymbolsHelper-Confirmed: 4:15.08.0+git20150717.1756+15.04 amd64
 libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _Z5qHashRKN7Akonadi10CollectionE at Base 15.07.90
  _Z5qHashRKN7Akonadi3TagE at Base 15.07.90
@@ -1573,6 +1573,7 @@ libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _ZN7Akonadi8ItemSync11qt_metacastEPKc at Base 15.07.90
  _ZN7Akonadi8ItemSync12deliveryDoneEv at Base 15.07.90
  _ZN7Akonadi8ItemSync12setBatchSizeEi at Base 15.07.90
+ _ZN7Akonadi8ItemSync12setMergeModeENS0_9MergeModeE at Base 4:15.08.0+git20150717.1756+15.04
  _ZN7Akonadi8ItemSync13setFetchScopeERNS_14ItemFetchScopeE at Base 15.07.90
  _ZN7Akonadi8ItemSync13setTotalItemsEi at Base 15.07.90
  _ZN7Akonadi8ItemSync16setFullSyncItemsERK7QVectorINS_4ItemEE at Base 15.07.90
@@ -2163,6 +2164,7 @@ libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _ZNK7Akonadi3Tag7setTypeERK10QByteArray at Base 15.07.90
  _ZNK7Akonadi3Tag8remoteIdEv at Base 15.07.90
  _ZNK7Akonadi3TageqERKS0_ at Base 15.07.90
+ _ZNK7Akonadi3TagneERKS0_ at Base 4:15.08.0+git20150717.1756+15.04
  _ZNK7Akonadi4Item10hasPayloadEv at Base 15.07.90
  _ZNK7Akonadi4Item11payloadBaseEv at Base 15.07.90
  _ZNK7Akonadi4Item11payloadDataEv at Base 15.07.90
@@ -2192,7 +2194,7 @@ libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _ZNK7Akonadi4Item9relationsEv at Base 15.07.90
  _ZNK7Akonadi6Entity10attributesEv at Base 15.07.90
  _ZNK7Akonadi6Entity12hasAttributeERK10QByteArray at Base 15.07.90
- (optional=templinst)_ZNK7Akonadi6Entity12hasAttributeINS_22EntityDisplayAttributeEEEbv at Base 15.07.90
+#MISSING: 4:15.08.0+git20150717.1756+15.04# (optional=templinst)_ZNK7Akonadi6Entity12hasAttributeINS_22EntityDisplayAttributeEEEbv at Base 15.07.90
  _ZNK7Akonadi6Entity14remoteRevisionEv at Base 15.07.90
  _ZNK7Akonadi6Entity16parentCollectionEv at Base 15.07.90
  _ZNK7Akonadi6Entity2idEv at Base 15.07.90
@@ -2223,6 +2225,7 @@ libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _ZNK7Akonadi7Session9sessionIdEv at Base 15.07.90
  _ZNK7Akonadi8ItemSync10metaObjectEv at Base 15.07.90
  _ZNK7Akonadi8ItemSync9batchSizeEv at Base 15.07.90
+ _ZNK7Akonadi8ItemSync9mergeModeEv at Base 4:15.08.0+git20150717.1756+15.04
  _ZNK7Akonadi8Relation11setRemoteIdERK10QByteArray at Base 15.07.90
  _ZNK7Akonadi8Relation4leftEv at Base 15.07.90
  _ZNK7Akonadi8Relation4typeEv at Base 15.07.90
diff --git a/test/test_kci_builder.rb b/test/test_kci_builder.rb
index 354ecc7..bece370 100644
--- a/test/test_kci_builder.rb
+++ b/test/test_kci_builder.rb
@@ -92,9 +92,17 @@ class KCIBuilderTest < TestCase
     end
     `git clone --origin packaging remote packaging`
 
-    # Actual test
+    # Actual run
     fake_home do
-      KCIBuilder.update_symbols(log_data, logs, architectures_with_log, project, source)
+      KCIBuilder.update_symbols(log_data, logs, architectures_with_log, project,
+                                source)
+    end
+
+    Dir.chdir('packaging') do
+      assert_equal(File.read(data('ref/libkf5akonadiagentbase5.symbols')),
+                   File.read('debian/libkf5akonadiagentbase5.symbols'))
+      assert_equal(File.read(data('ref/libkf5akonadicore5.symbols')),
+                   File.read('debian/libkf5akonadicore5.symbols'))
     end
   end
 end

-- 
ci-tooling packaging