diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-28 15:24:07 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-28 15:24:07 +0000 |
commit | a5b2377d00aeeebe6e45ea58299c6aaa027e3ca9 (patch) | |
tree | bd6a3976e55ed9920914304d467e055146b1bdab /ceilometermiddleware | |
parent | 809e98c3b24e111c5f28136452a06e9568449519 (diff) | |
parent | cf2927417183c4d4fc7b288dda9af02be1a143ee (diff) | |
download | ceilometermiddleware-a5b2377d00aeeebe6e45ea58299c6aaa027e3ca9.tar.gz |
Merge "Avoid useless dependency on oslo_utils"
Diffstat (limited to 'ceilometermiddleware')
-rw-r--r-- | ceilometermiddleware/swift.py | 4 | ||||
-rw-r--r-- | ceilometermiddleware/tests/test_swift.py | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py index ed679a7..d9106d2 100644 --- a/ceilometermiddleware/swift.py +++ b/ceilometermiddleware/swift.py @@ -45,12 +45,12 @@ before "proxy-server" and add the following filter in the file: # Logging level control log_level = WARNING """ +import datetime import functools import logging from oslo_config import cfg import oslo_messaging -from oslo_utils import timeutils from pycadf import event as cadf_event from pycadf.helper import api from pycadf import measurement as cadf_measurement @@ -229,7 +229,7 @@ class Swift(object): except ValueError: return - now = timeutils.utcnow().isoformat() + now = datetime.datetime.utcnow().isoformat() resource_metadata = { "path": path, diff --git a/ceilometermiddleware/tests/test_swift.py b/ceilometermiddleware/tests/test_swift.py index 4c0f43e..8e9cbf7 100644 --- a/ceilometermiddleware/tests/test_swift.py +++ b/ceilometermiddleware/tests/test_swift.py @@ -12,10 +12,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - import mock from oslo_config import cfg -from oslo_utils import timeutils import six from ceilometermiddleware import swift @@ -312,9 +310,9 @@ class TestSwift(tests_base.TestCase): list(app(req.environ, self.start_response)) self.assertEqual(0, len(notify.call_args_list)) - @mock.patch.object(timeutils, 'utcnow') - def test_emit_event_fail(self, mocked_time): - mocked_time.side_effect = Exception("a exception") + @mock.patch('six.moves.urllib.parse.quote') + def test_emit_event_fail(self, mocked_func): + mocked_func.side_effect = Exception("a exception") app = swift.Swift(FakeApp(body=["test"]), {}) req = FakeRequest('/1.0/account/container', environ={'REQUEST_METHOD': 'GET'}) |