import hashlib
import json
import logging
-import mock
import sys
import unittest
import datetime
+from unittest import mock
+
import arvados
import arvados.collection
import arvados.keep
from arvados.http_to_keep import http_to_keep
-import ruamel.yaml as yaml
-
# Turns out there was already "FakeCurl" that serves the same purpose, but
# I wrote this before I knew that. Whoops.
class CurlMock: