Merge pull request google#10 from mitya57/master

aliafshar · aliafshar · commit 79d2d3c8a266 · 2015-03-13T08:43:25.000-07:00
Various fixes.
diff --git a/samples/apps/emailsettings_pop_settings.py b/samples/apps/emailsettings_pop_settings.py
@@ -131,7 +131,7 @@ def main():
       raise PopSettingsException('Invalid consumer credentials')
     elif e.status == 503:
       raise PopSettingsException('Server busy')
-    else e.status == 500:
+    elif e.status == 500:
       raise PopSettingsException('Internal server error')
     else:
       raise PopSettingsException('Unknown error')
diff --git a/src/gdata/service.py b/src/gdata/service.py
@@ -1084,7 +1084,7 @@ def Get(self, uri, extra_headers=None, redirects_remaining=4,
           return result_body
         return entry
       return feed
-    elif server_response.status == 302:
+    elif server_response.status in (301, 302):
       if redirects_remaining > 0:
         location = (server_response.getheader('Location')
                     or server_response.getheader('location'))
diff --git a/tests/module_test_runner.py b/tests/module_test_runner.py
@@ -41,7 +41,7 @@ def RunAllTests(self):
     It also sets any module variables which match the settings keys to the
     corresponding values in the settings member.
     """
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner(verbosity=2)
     for module in self.modules:
       # Set any module variables according to the contents in the settings
       for setting, value in self.settings.iteritems():
@@ -53,5 +53,6 @@ def RunAllTests(self):
           pass
       # We have set all of the applicable settings for the module, now
       # run the tests.
-      print '\nRunning all tests in module', module.__name__
-      runner.run(unittest.defaultTestLoader.loadTestsFromModule(module))    
+      result = runner.run(unittest.defaultTestLoader.loadTestsFromModule(module))
+      if not result.wasSuccessful():
+        raise Exception('Tests failed!')
