← Back to branch summary

~mvo/software-center/new-pep8

« back to all changes in this revision

Viewing changes to tests/test_region.py

  • Committer: Michael Vogt
  • Date: 2012-07-19 09:29:16 UTC
  • mfrom: (2989.33.20 5.2)
  • Revision ID: michael.vogt@ubuntu.com-20120719092916-dei4mt5hhyxkqm23
merged from the 5.2 branch, resolve conflicts (many :/) and fix failing tests in test_unity_launcher_integration via setUpClass and updates to the DesktopFilepathConversionTestCase bits to use os.path.join()

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_region.py
28
28
        self.assertEqual(get_region_name("BO"), "Bolivia")
29
29
        self.assertEqual(get_region_name("DE"), "Germany")
30
30
 
 
31
    @unittest.skip("real ubuntu-geoip not always reliable")
31
32
    def test_get_region_geoclue(self):
32
33
        res = self.region._get_region_geoclue()
33
34
        self.assertNotEqual(len(res), 0)