Merge pull request #7 from brentru/fix-failing-tests

Fix failing CI tests on lint
This commit is contained in:
Brent Rubell 2021-03-17 14:10:38 -04:00 committed by GitHub
commit 9f20aa1d89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 15 deletions

View file

@ -8,6 +8,8 @@
# SPDX-FileCopyrightText: 2021 Brent Rubell for Adafruit Industries
# SPDX-License-Identifier: Python-2.0
# Implements a subset of https://github.com/python/cpython/blob/master/Lib/test/datetimetester.py
# NOTE: This test is based off CPython and therefore linting is disabled within this file.
# pylint:disable=invalid-name, no-member, wrong-import-position, undefined-variable, no-self-use, cell-var-from-loop, misplaced-comparison-constant, too-many-public-methods, fixme, import-outside-toplevel, unused-argument, too-few-public-methods
import sys
import unittest

View file

@ -8,14 +8,9 @@
# SPDX-FileCopyrightText: 2021 Brent Rubell for Adafruit Industries
# SPDX-License-Identifier: Python-2.0
# Implements a subset of https://github.com/python/cpython/blob/master/Lib/test/datetimetester.py
# NOTE: This test is based off CPython and therefore linting is disabled within this file.
# pylint:disable=invalid-name, no-member, cell-var-from-loop, unused-argument, no-self-use, too-few-public-methods, raise-missing-from, too-many-statements, too-many-lines, undefined-variable, eval-used, import-outside-toplevel, redefined-outer-name, too-many-locals, reimported, protected-access, wrong-import-position, consider-using-enumerate, wrong-import-order, redefined-builtin, too-many-public-methods
import sys
import unittest
from test import support
from test_date import TestDate
# CPython standard implementation
from datetime import datetime as cpython_datetime
from datetime import MINYEAR, MAXYEAR
# CircuitPython subset implementation
sys.path.append("..")
@ -26,6 +21,15 @@ from adafruit_datetime import date
from adafruit_datetime import time
from adafruit_datetime import timezone
import unittest
from test import support
from test_date import TestDate
# CPython standard implementation
from datetime import datetime as cpython_datetime
from datetime import MINYEAR, MAXYEAR
# TZinfo test
class FixedOffset(tzinfo):
def __init__(self, offset, name, dstoffset=42):
@ -268,7 +272,7 @@ class TestDateTime(TestDate):
@unittest.skip("ctime not implemented")
def test_more_ctime(self):
# Test fields that TestDate doesn't touch.
import time
import time as cpython_time
t = self.theclass(2002, 3, 2, 18, 3, 5, 123)
self.assertEqual(t.ctime(), "Sat Mar 2 18:03:05 2002")
@ -280,7 +284,9 @@ class TestDateTime(TestDate):
# So test a case where that difference doesn't matter.
t = self.theclass(2002, 3, 22, 18, 3, 5, 123)
self.assertEqual(t.ctime(), time.ctime(time.mktime(t.timetuple())))
self.assertEqual(
t.ctime(), cpython_time.ctime(cpython_time.mktime(t.timetuple()))
)
def test_tz_independent_comparing(self):
dt1 = self.theclass(2002, 3, 1, 9, 0, 0)
@ -537,7 +543,6 @@ class TestDateTime(TestDate):
self.assertEqual(self.theclass.fromtimestamp(t.timestamp()), t)
# Timestamp may raise an overflow error on some platforms
# XXX: Do we care to support the first and last year?
for t in [self.theclass(2, 1, 1), self.theclass(9998, 12, 12)]:
try:
s = t.timestamp()

View file

@ -8,17 +8,19 @@
# SPDX-FileCopyrightText: 2021 Brent Rubell for Adafruit Industries
# SPDX-License-Identifier: Python-2.0
# Implements a subset of https://github.com/python/cpython/blob/master/Lib/test/datetimetester.py
import unittest
# CPython standard implementation
from datetime import time as cpython_time
# NOTE: This test is based off CPython and therefore linting is disabled within this file.
# pylint:disable=invalid-name, no-member, cell-var-from-loop, unused-argument, no-self-use, too-few-public-methods, consider-using-enumerate, undefined-variable, wrong-import-order, wrong-import-position
# CircuitPython subset implementation
import sys
sys.path.append("..")
from adafruit_datetime import time as cpy_time
# CPython standard implementation
from datetime import time as cpython_time
import unittest
# An arbitrary collection of objects of non-datetime types, for testing
# mixed-type comparisons.
OTHERSTUFF = (10, 34.5, "abc", {}, [], ())