Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-fix-autopilot-warning into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Use fixtures.EnvironmentVariable instead of patch_environment, which
    is deprecated.

Use fixtures.EnvironmentVariable instead of patch_environment, which
    is deprecated.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/318/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2686
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/318/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-fix-autopilot-warning]

174. By Bartosz Kosiorek on 2015-04-30

Update translation

175. By Bartosz Kosiorek on 2015-04-30

Sync with trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/319/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2688
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2688/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/41

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/319/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:175
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/320/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2689
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/42

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/320/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm, thanks

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-04-30 06:59:48 +0000
+++ po/com.ubuntu.calculator.pot	2015-04-30 09:31:42 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-30 08:58+0200\n"
+"POT-Creation-Date: 2015-04-30 11:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -101,14 +101,14 @@
 msgid "Yesterday"
 msgstr ""
 
-#: /tmp/tmp.qLTfJqU5Ys/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /tmp/tmp.qLTfJqU5Ys/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /tmp/tmp.qLTfJqU5Ys/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2015-04-14 19:17:35 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2015-04-30 09:31:42 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014 Canonical Ltd
+# Copyright (C) 2013-2015 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -19,6 +19,7 @@
 import os
 import shutil
 import logging
+import fixtures
 
 import ubuntu_calculator_app
 
@@ -65,7 +66,7 @@
         # Unset the current locale to ensure locale-specific data
         # (day and month names, first day of the week, …) doesn’t get
         # in the way of test expectations.
-        self.patch_environment('LC_ALL', 'C')
+        self.useFixture(fixtures.EnvironmentVariable('LC_ALL', 'C'))
         self.app = ubuntu_calculator_app.CalculatorApp(self.launcher(),
                                                        self.test_type)