Merge lp:~charlesk/pay-service/silence-prices-warning into lp:pay-service/15.04

[Charles Kerr]

in libpay's create_pay_item_from_variant(), don't warn on some unhandled properties, e.g. 'prices'

in libpay's create_pay_item_from_variant(), don't warn on some unhandled properties, e.g. 'prices'

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/pay-service-15.04-ci/97/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-amd64-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/97/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-15.04-ci/97/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

This needs to be re-created against lp:pay-service as we are set up for dual landing now, so landing into the 15.04 branch only shouldn't be done.

review: Needs Resubmitting

Unmerged revisions

54. By Charles Kerr on 2015-11-20

in libpay's create_pay_item_from_variant(), don't warn on some properties, e.g. 'prices'

=== modified file 'libpay/internal/package.cpp'
--- libpay/internal/package.cpp	2015-11-03 21:06:49 +0000
+++ libpay/internal/package.cpp	2015-11-20 16:09:56 +0000
@@ -286,9 +286,14 @@
                 }
                 else
                 {
-                    auto valstr = g_variant_print(value, true);
-                    g_warning("Unhandled item property '%s': '%s'", key, valstr);
-                    g_free(valstr);
+                    const std::set<std::string> silent {"prices"};
+
+                    if ((key != nullptr) && !silent.count(key))
+                    {
+                        auto valstr = g_variant_print(value, true);
+                        g_warning("Unhandled item property '%s': '%s'", key, valstr);
+                        g_free(valstr);
+                    }
                 }
             }
         }
 
=== modified file 'tests/com_canonical_pay_store.py'
--- tests/com_canonical_pay_store.py	2015-11-03 21:06:49 +0000
+++ tests/com_canonical_pay_store.py	2015-11-20 16:09:56 +0000
@@ -61,6 +61,10 @@
         'completed_timestamp': dbus.UInt64(0.0),
         'description': dbus.String('The is a default item'),
         'price': dbus.String('$1'),
+        'prices': {
+            dbus.String("USD"): dbus.String("$1"),
+            dbus.String("GBP"): dbus.String("£1")
+        },
         'purchase_id': dbus.UInt64(0.0),
         'refundable_until': dbus.UInt64(0.0),
         'sku': dbus.String('default_item'),