From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 20 Aug 2013 19:00:59 +0000 (+0000)
Subject: Merge "Use FakeLoopingCall instead of the real one"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fc705de5e4058efcd9b4f268f1428bc8e673193c;p=openstack-build%2Fcinder-build.git

Merge "Use FakeLoopingCall instead of the real one"
---

fc705de5e4058efcd9b4f268f1428bc8e673193c
diff --cc cinder/tests/brick/test_brick_connector.py
index f40fa25b3,fe8d44b3d..37cc17b99
--- a/cinder/tests/brick/test_brick_connector.py
+++ b/cinder/tests/brick/test_brick_connector.py
@@@ -335,9 -360,12 +360,12 @@@ class AoEConnectorTestCase(ConnectorTes
      def setUp(self):
          super(AoEConnectorTestCase, self).setUp()
          self.mox = mox.Mox()
 -        self.connector = connector.AoEConnector()
 +        self.connector = connector.AoEConnector('sudo')
          self.connection_properties = {'target_shelf': 'fake_shelf',
                                        'target_lun': 'fake_lun'}
+         self.stubs.Set(loopingcall,
+                        'FixedIntervalLoopingCall',
+                        FakeFixedIntervalLoopingCall)
  
      def tearDown(self):
          self.mox.VerifyAll()