Merge lp:~laney/telephony-service/libphonenumber7.1.0 into lp:telephony-service

[Iain Lane]

Update international test number to be valid with libphonenumber 7.1.0

I've been working with the Debian maintainer of libphonenumber to get our packages in sync.

As of libphonenumber 7.1.0-2, which I uploaded today, it can be synced.

libphonenumber fails one test now - the international number given isn't matched by the new metadata in this version. Is it because the given number is not actually valid? If so, I've updated it by changing one digit and the test now passes again. Other countries, for example numbers in the UK, also work.

[Iain Lane (laney)]

Once we get synced, Daniel (Debian maintainer) is keen to keep the package that way. That means that future changes should be submitted to upstream and to him (e.g. via email or the Debian BTS) please.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1136
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/588/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/256
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/256

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/588/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

So https://launchpad.net/ubuntu/+source/libphonenumber/7.0.8-0ubuntu3 means we can't sync.

That's pretty frustrating.

And it doesn't appear to be forwarded.

Unmerged revisions

1136. By Iain Lane on 2015-11-10

Update Brazillian (international) test phone number

=== modified file 'tests/Ubuntu.Telephony/tst_PhoneNumberPhoneUtils.qml'
--- tests/Ubuntu.Telephony/tst_PhoneNumberPhoneUtils.qml	2014-12-09 12:53:19 +0000
+++ tests/Ubuntu.Telephony/tst_PhoneNumberPhoneUtils.qml	2015-11-10 12:10:46 +0000
@@ -29,7 +29,7 @@
         var data = [];
         data.push({input: "6681800", expectedOutput: "668-1800"})                    // Local number
         data.push({input: "7327572923", expectedOutput: "[phone]"})           // Country number
-        data.push({input: "[phone]", expectedOutput: "[phone]"})      // International number
+        data.push({input: "[phone]", expectedOutput: "[phone]"})      // International number
         data.push({input: "55555555555", expectedOutput: "55555555555"})             // Invalid number
         data.push({input: "*144", expectedOutput: "*144"})                           // Special number
         data.push({input: "#123#", expectedOutput: "#123#"})                         // Operators command
@@ -57,8 +57,8 @@
                       expectedMatches: ["650 253 0000"]})    // Local number
         data.push({text: "my phnle number 7327572923, please call me",
                       expectedMatches: ["7327572923"]})      // Country number
-        data.push({text: "my international number [phone], please call me",
-                      expectedMatches: ["[phone]"]})   // International number
+        data.push({text: "my international number [phone], please call me",
+                      expectedMatches: ["[phone]"]})   // International number
         data.push({text: "this is an invalid number 55555555555, yes yes it is",
                       expectedMatches: []})                  // Invalid number
         data.push({text: "could you call me between 15h30-16h yes?",