Skip to content

Commit cc51bc0

Browse files
author
Jon Wayne Parrott
committed
Add complete tests for resumable
1 parent aa7999f commit cc51bc0

File tree

4 files changed

+327
-458
lines changed

4 files changed

+327
-458
lines changed

bigquery/google/cloud/bigquery/table.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"""Define API Datasets."""
1616

1717
import datetime
18-
import json
1918
import os
2019

2120
import httplib2
@@ -26,7 +25,6 @@
2625
from google.resumable_media.requests import MultipartUpload
2726
from google.resumable_media.requests import ResumableUpload
2827

29-
from google.cloud._helpers import _bytes_to_unicode
3028
from google.cloud._helpers import _datetime_from_microseconds
3129
from google.cloud._helpers import _millis_from_datetime
3230
from google.cloud.exceptions import NotFound
@@ -50,6 +48,7 @@
5048
_READ_LESS_THAN_SIZE = (
5149
'Size {:d} was specified but the file-like object only had '
5250
'{:d} bytes remaining.')
51+
_DEFAULT_NUM_RETRIES = 6
5352

5453

5554
class Table(object):
@@ -1004,7 +1003,7 @@ def upload_from_file(self,
10041003
source_format,
10051004
rewind=False,
10061005
size=None,
1007-
num_retries=6,
1006+
num_retries=_DEFAULT_NUM_RETRIES,
10081007
allow_jagged_rows=None,
10091008
allow_quoted_newlines=None,
10101009
create_disposition=None,
@@ -1215,13 +1214,6 @@ def _build_schema_resource(fields):
12151214
# pylint: enable=unused-argument
12161215

12171216

1218-
def _convert_timestamp(value):
1219-
"""Helper for :meth:`Table.insert_data`."""
1220-
if isinstance(value, datetime.datetime):
1221-
value = _microseconds_from_datetime(value) * 1e-6
1222-
return value
1223-
1224-
12251217
def _maybe_rewind(stream, rewind=False):
12261218
"""Rewind the stream if desired.
12271219

bigquery/nox.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def unit_tests(session, python_version):
4040
# Run py.test against the unit tests.
4141
session.run('py.test', '--quiet',
4242
'--cov=google.cloud.bigquery', '--cov=tests.unit', '--cov-append',
43-
'--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
44-
'tests/unit',
43+
'--cov-config=.coveragerc', '--cov-report=term-missing', '--cov-fail-under=97',
44+
'tests/unit', *session.posargs
4545
)
4646

4747

0 commit comments

Comments
 (0)