Merge ~smoser/cloud-init:fix/locale-test-update into cloud-init:master

[Scott Moser]

tests: adjust locale integration test to parse default locale.

The locale integration test started failing with commit 0ef61b28.
This was just because the test's expectations on the content/formatting
of /etc/default/locale were too strict. The change here is to read
the file as a set of shell variables and assert that the values are
set correctly.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:85d887eb0beabfadea407eff508614856aec53c3
https://jenkins.ubuntu.com/server/job/cloud-init-ci/94/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    FAILED: CentOS 6 & 7: Build & Test

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/94/rebuild

review: Needs Fixing (continuous-integration)

[Joshua Powers (powersj)]

review: Approve

[Scott Moser (smoser)]

I'm ignoring the failure above as that is now fixed on trunk.
8a5296c41db45be3a172862f324ad44e732a2250
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/328101

so, pulling this. thanks for review.

review: Approve

diff --git a/tests/cloud_tests/testcases/modules/locale.py b/tests/cloud_tests/testcases/modules/locale.py
index 63e53ff..cb9e1dc 100644
--- a/tests/cloud_tests/testcases/modules/locale.py
+++ b/tests/cloud_tests/testcases/modules/locale.py
@@ -3,14 +3,17 @@
 """cloud-init Integration Test Verify Script."""
 from tests.cloud_tests.testcases import base
 
+from cloudinit import util
+
 
 class TestLocale(base.CloudTestCase):
     """Test locale is set properly."""
 
     def test_locale(self):
         """Test locale is set properly."""
-        out = self.get_data_file('locale_default')
-        self.assertIn('LANG="en_GB.UTF-8"', out)
+        data = util.load_shell_content(self.get_data_file('locale_default'))
+        self.assertIn("LANG", data)
+        self.assertEqual('en_GB.UTF-8', data['LANG'])
 
     def test_locale_a(self):
         """Test locale -a has both options."""