openstack/charm-swift-proxy
Code Issues Proposed changes

Call assess_status() in pause/resume actions and update is_paused

Browse Source
This commit is contained in:
Corey Bryant
2015-10-13 08:59:52 -04:00
parent 744d05a142
commit 93ea05a733
7 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
unit_tests/test_swift_utils.py
View File

@@ -5,8 +5,10 @@ import tempfile
import uuid
import unittest
from mock import patch
with mock.patch('charmhelpers.core.hookenv.config'):
import lib.swift_utils as swift_utils
with patch('lib.swift_utils.is_paused') as is_paused:
import lib.swift_utils as swift_utils
def init_ring_paths(tmpdir):
@@ -223,18 +225,6 @@ class SwiftUtilsTestCase(unittest.TestCase):
rsps = []
self.assertIsNone(swift_utils.get_first_available_value(rsps, 'key3'))
def test_is_paused_unknown(self):
fake_status_get = lambda: ("unknown", "")
self.assertFalse(swift_utils.is_paused(status_get=fake_status_get))
def test_is_paused_paused(self):
fake_status_get = lambda: ("maintenance", "Paused")
self.assertTrue(swift_utils.is_paused(status_get=fake_status_get))
def test_is_paused_other_maintenance(self):
fake_status_get = lambda: ("maintenance", "Hook")
self.assertFalse(swift_utils.is_paused(status_get=fake_status_get))
@mock.patch('lib.swift_utils.config')
@mock.patch('lib.swift_utils.set_os_workload_status')
@mock.patch('lib.swift_utils.SwiftRingContext.__call__')