Merge "Switch Redis driver modules over to oslo.utils.timeutils"
This commit is contained in:
commit
03f4414986
@ -17,10 +17,10 @@ import time
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
from oslo.utils import timeutils
|
||||||
import redis
|
import redis
|
||||||
|
|
||||||
from zaqar.openstack.common.cache import cache as oslo_cache
|
from zaqar.openstack.common.cache import cache as oslo_cache
|
||||||
from zaqar.openstack.common import timeutils
|
|
||||||
from zaqar.queues import storage
|
from zaqar.queues import storage
|
||||||
from zaqar.queues.storage.redis import controllers
|
from zaqar.queues.storage.redis import controllers
|
||||||
from zaqar.queues.storage.redis import driver
|
from zaqar.queues.storage.redis import driver
|
||||||
@ -292,7 +292,7 @@ class RedisClaimsTest(base.ClaimControllerTest):
|
|||||||
client_uuid=str(uuid.uuid4()))
|
client_uuid=str(uuid.uuid4()))
|
||||||
|
|
||||||
now = timeutils.utcnow_ts()
|
now = timeutils.utcnow_ts()
|
||||||
timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow_ts'
|
timeutils_utcnow = 'oslo.utils.timeutils.utcnow_ts'
|
||||||
|
|
||||||
# Test a single claim
|
# Test a single claim
|
||||||
with mock.patch(timeutils_utcnow) as mock_utcnow:
|
with mock.patch(timeutils_utcnow) as mock_utcnow:
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
import functools
|
import functools
|
||||||
|
|
||||||
import msgpack
|
import msgpack
|
||||||
|
from oslo.utils import timeutils
|
||||||
import redis
|
import redis
|
||||||
|
|
||||||
from zaqar.common import decorators
|
from zaqar.common import decorators
|
||||||
from zaqar.openstack.common import log as logging
|
from zaqar.openstack.common import log as logging
|
||||||
from zaqar.openstack.common import timeutils
|
|
||||||
from zaqar.queues import storage
|
from zaqar.queues import storage
|
||||||
from zaqar.queues.storage import errors
|
from zaqar.queues.storage import errors
|
||||||
from zaqar.queues.storage.redis import messages
|
from zaqar.queues.storage.redis import messages
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
import functools
|
import functools
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import redis
|
import redis
|
||||||
|
|
||||||
from zaqar.common import decorators
|
from zaqar.common import decorators
|
||||||
from zaqar.openstack.common import strutils
|
from zaqar.openstack.common import strutils
|
||||||
from zaqar.openstack.common import timeutils
|
|
||||||
from zaqar.queues import storage
|
from zaqar.queues import storage
|
||||||
from zaqar.queues.storage import errors
|
from zaqar.queues.storage import errors
|
||||||
from zaqar.queues.storage.redis import models
|
from zaqar.queues.storage.redis import models
|
||||||
|
@ -16,9 +16,9 @@ import functools
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import msgpack
|
import msgpack
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from zaqar.openstack.common import strutils
|
from zaqar.openstack.common import strutils
|
||||||
from zaqar.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
_pack = msgpack.Packer(encoding='utf-8', use_bin_type=True).pack
|
_pack = msgpack.Packer(encoding='utf-8', use_bin_type=True).pack
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
import functools
|
import functools
|
||||||
|
|
||||||
import msgpack
|
import msgpack
|
||||||
|
from oslo.utils import timeutils
|
||||||
import redis
|
import redis
|
||||||
|
|
||||||
from zaqar.common import decorators
|
from zaqar.common import decorators
|
||||||
from zaqar.openstack.common import log as logging
|
from zaqar.openstack.common import log as logging
|
||||||
from zaqar.openstack.common import timeutils
|
|
||||||
from zaqar.queues import storage
|
from zaqar.queues import storage
|
||||||
from zaqar.queues.storage import errors
|
from zaqar.queues.storage import errors
|
||||||
from zaqar.queues.storage.redis import utils
|
from zaqar.queues.storage.redis import utils
|
||||||
|
Loading…
Reference in New Issue
Block a user