Merge "Fix unit tests failing in some cases"

test/unit/common/test_container_sync_realms.py

@@ -13,10 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import errno
 import os
 import unittest
 import uuid
 
+from mock import patch
 from swift.common.container_sync_realms import ContainerSyncRealms
 from test.unit import FakeLogger, temptree
 
@@ -41,18 +43,21 @@ class TestUtils(unittest.TestCase):
         with temptree([fname], [fcontents]) as tempdir:
             logger = FakeLogger()
             fpath = os.path.join(tempdir, fname)
-            os.chmod(tempdir, 0)
+
-            csr = ContainerSyncRealms(fpath, logger)
+            def _mock_getmtime(path):
-            try:
+                raise OSError(errno.EACCES,
-                self.assertEqual(
+                              os.strerror(errno.EACCES) +
-                    logger.all_log_lines(),
+                              ": '%s'" % (fpath))
-                    {'error': [
+            with patch('os.path.getmtime', _mock_getmtime):
-                        "Could not load '%s': [Errno 13] Permission denied: "
+                csr = ContainerSyncRealms(fpath, logger)
-                        "'%s'" % (fpath, fpath)]})
+
-                self.assertEqual(csr.mtime_check_interval, 300)
+            self.assertEqual(
-                self.assertEqual(csr.realms(), [])
+                logger.all_log_lines(),
-            finally:
+                {'error': [
-                os.chmod(tempdir, 0700)
+                    "Could not load '%s': [Errno 13] Permission denied: "
+                    "'%s'" % (fpath, fpath)]})
+            self.assertEqual(csr.mtime_check_interval, 300)
+            self.assertEqual(csr.realms(), [])
 
     def test_empty(self):
         fname = 'container-sync-realms.conf'

test/unit/obj/test_server.py

@@ -4414,7 +4414,7 @@ class TestZeroCopy(unittest.TestCase):
         self.wsgi_greenlet = spawn(
             wsgi.server, listener, self.object_controller, NullLogger())
 
-        self.http_conn = httplib.HTTPConnection('localhost', port)
+        self.http_conn = httplib.HTTPConnection('127.0.0.1', port)
         self.http_conn.connect()
 
     def tearDown(self):