mirror of https://github.com/scrapy/scrapy.git
Merge pull request #7145 from Icorebleidd/master
Fix duplicate assertion in test_utils_deprecate
This commit is contained in:
parent
0adc561348
commit
1e8de24380
|
|
@ -169,17 +169,12 @@ class TestWarnWhenSubclassed:
|
||||||
class UnrelatedClass:
|
class UnrelatedClass:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
class OldStyleClass:
|
|
||||||
pass
|
|
||||||
|
|
||||||
assert issubclass(UpdatedUserClass1, NewName)
|
assert issubclass(UpdatedUserClass1, NewName)
|
||||||
assert issubclass(UpdatedUserClass1a, NewName)
|
assert issubclass(UpdatedUserClass1a, NewName)
|
||||||
assert issubclass(UpdatedUserClass1, DeprecatedName)
|
assert issubclass(UpdatedUserClass1, DeprecatedName)
|
||||||
assert issubclass(UpdatedUserClass1a, DeprecatedName)
|
assert issubclass(UpdatedUserClass1a, DeprecatedName)
|
||||||
assert issubclass(OutdatedUserClass1, DeprecatedName)
|
assert issubclass(OutdatedUserClass1, DeprecatedName)
|
||||||
assert not issubclass(UnrelatedClass, DeprecatedName)
|
assert not issubclass(UnrelatedClass, DeprecatedName)
|
||||||
assert not issubclass(OldStyleClass, DeprecatedName)
|
|
||||||
assert not issubclass(OldStyleClass, DeprecatedName)
|
|
||||||
assert not issubclass(OutdatedUserClass1, OutdatedUserClass1a)
|
assert not issubclass(OutdatedUserClass1, OutdatedUserClass1a)
|
||||||
assert not issubclass(OutdatedUserClass1a, OutdatedUserClass1)
|
assert not issubclass(OutdatedUserClass1a, OutdatedUserClass1)
|
||||||
|
|
||||||
|
|
@ -206,9 +201,6 @@ class TestWarnWhenSubclassed:
|
||||||
class UnrelatedClass:
|
class UnrelatedClass:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
class OldStyleClass:
|
|
||||||
pass
|
|
||||||
|
|
||||||
assert isinstance(UpdatedUserClass2(), NewName)
|
assert isinstance(UpdatedUserClass2(), NewName)
|
||||||
assert isinstance(UpdatedUserClass2a(), NewName)
|
assert isinstance(UpdatedUserClass2a(), NewName)
|
||||||
assert isinstance(UpdatedUserClass2(), DeprecatedName)
|
assert isinstance(UpdatedUserClass2(), DeprecatedName)
|
||||||
|
|
@ -218,7 +210,6 @@ class TestWarnWhenSubclassed:
|
||||||
assert not isinstance(OutdatedUserClass2a(), OutdatedUserClass2)
|
assert not isinstance(OutdatedUserClass2a(), OutdatedUserClass2)
|
||||||
assert not isinstance(OutdatedUserClass2(), OutdatedUserClass2a)
|
assert not isinstance(OutdatedUserClass2(), OutdatedUserClass2a)
|
||||||
assert not isinstance(UnrelatedClass(), DeprecatedName)
|
assert not isinstance(UnrelatedClass(), DeprecatedName)
|
||||||
assert not isinstance(OldStyleClass(), DeprecatedName)
|
|
||||||
|
|
||||||
def test_clsdict(self):
|
def test_clsdict(self):
|
||||||
with warnings.catch_warnings():
|
with warnings.catch_warnings():
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue