openstack/swift
Code Issues Proposed changes

Remove simplejson from tests

Browse Source 
Since we're dropping Python 2.6 support, we can rely on stdlib's json
and get rid of our dependency on simplejson.

This commit just takes simplejson out of the unit and functional
tests. They still pass.

Change-Id: I96f17df81fa5d265395a938b19213d2638682106
This commit is contained in:
Samuel Merritt 2015-05-28 15:30:47 -07:00
parent f66e9797be
commit 736cf54adf
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/test_object.py
View File

@ -15,11 +15,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import json
import unittest import unittest
from nose import SkipTest from nose import SkipTest
from uuid import uuid4 from uuid import uuid4
from swift.common.utils import json
from test.functional import check_response, retry, requires_acls, \ from test.functional import check_response, retry, requires_acls, \
requires_policies requires_policies

3
test/unit/common/middleware/test_list_endpoints.py
View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import array import array
import json
import unittest import unittest
from tempfile import mkdtemp from tempfile import mkdtemp
from shutil import rmtree from shutil import rmtree
@ -21,7 +22,7 @@ from shutil import rmtree
import os import os
import mock import mock
from swift.common import ring, utils from swift.common import ring, utils
from swift.common.utils import json, split_path from swift.common.utils import split_path
from swift.common.swob import Request, Response from swift.common.swob import Request, Response
from swift.common.middleware import list_endpoints from swift.common.middleware import list_endpoints
from swift.common.storage_policy import StoragePolicy, POLICIES from swift.common.storage_policy import StoragePolicy, POLICIES

3
test/unit/common/test_direct_client.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import json
import unittest import unittest
import os import os
import urllib import urllib
@ -25,7 +26,7 @@ import mock
from swift.common import direct_client from swift.common import direct_client
from swift.common.exceptions import ClientException from swift.common.exceptions import ClientException
from swift.common.utils import json, Timestamp from swift.common.utils import Timestamp
from swift.common.swob import HeaderKeyDict, RESPONSE_REASONS from swift.common.swob import HeaderKeyDict, RESPONSE_REASONS
from swift.common.storage_policy import POLICIES from swift.common.storage_policy import POLICIES

2
test/unit/proxy/controllers/test_info.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import json
import unittest import unittest
import time import time
from mock import Mock from mock import Mock
@ -20,7 +21,6 @@ from mock import Mock
from swift.proxy.controllers import InfoController from swift.proxy.controllers import InfoController
from swift.proxy.server import Application as ProxyApp from swift.proxy.server import Application as ProxyApp
from swift.common import utils from swift.common import utils
from swift.common.utils import json
from swift.common.swob import Request, HTTPException from swift.common.swob import Request, HTTPException