import datetime
import json
import logging
-import mock
import multiprocessing
import os
import pwd
import unittest
import uuid
+from unittest import mock
+
import arvados
import arvados.commands.put as arv_put
from . import arvados_testutil as tutil