Skip to content

Using unittest2 in place of unittest #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nathanielmanistaatgoogle merged 1 commit into from
Mar 9, 2015
Merged

Using unittest2 in place of unittest #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/test_channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

__author__ = '[email protected] (Joe Gregorio)'

import unittest
import unittest2 as unittest
import datetime

from googleapiclient import channel
Expand Down
2 changes: 1 addition & 1 deletion tests/test_discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import os
import pickle
import sys
import unittest
import unittest2 as unittest
import urlparse
import StringIO

Expand Down
2 changes: 1 addition & 1 deletion tests/test_errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
__author__ = '[email protected] (Ali Afshar)'


import unittest
import unittest2 as unittest
import httplib2


Expand Down
2 changes: 1 addition & 1 deletion tests/test_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import httplib2
import logging
import os
import unittest
import unittest2 as unittest
import urllib
import random
import StringIO
Expand Down
2 changes: 1 addition & 1 deletion tests/test_json_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import copy
import json
import os
import unittest
import unittest2 as unittest
import httplib2
import googleapiclient.model

Expand Down
2 changes: 1 addition & 1 deletion tests/test_mocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import httplib2
import os
import unittest
import unittest2 as unittest

from googleapiclient.errors import HttpError
from googleapiclient.errors import UnexpectedBodyError
Expand Down
2 changes: 1 addition & 1 deletion tests/test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

__author__ = '[email protected] (Joe Gregorio)'

import unittest
import unittest2 as unittest

from googleapiclient.model import BaseModel
from googleapiclient.model import makepatch
Expand Down
2 changes: 1 addition & 1 deletion tests/test_protobuf_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

__author__ = '[email protected] (Matt McDonald)'

import unittest
import unittest2 as unittest
import httplib2
import googleapiclient.model

Expand Down
2 changes: 1 addition & 1 deletion tests/test_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import json
import os
import unittest
import unittest2 as unittest
import StringIO

from googleapiclient.schema import Schemas
Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ deps = keyring
django
webtest
nose
unittest2
setenv = PYTHONPATH=../google_appengine

[testenv:py26]
Expand Down