|
From: Oleg B. <no...@so...> - 2016-09-22 18:02:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 804bfd1762c8316393c3fa8815a54f73df6bada8 (commit)
via 3fdf20c184044eff4318426b4c5dbe4cbb450f30 (commit)
via 5535bb5c62cb8d4f60bf6c865bd6c3313129ef92 (commit)
from 66225e81c0b29a2e7a5c89ecff72f8f90e409a3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/804bfd1762c8316393c3fa8815a54f73df6bada8
commit 804bfd1762c8316393c3fa8815a54f73df6bada8
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 22 01:36:46 2016 +0300
Ignore .cache and .tox directories only at the top
Ignore other directories as directories.
diff --git a/.gitignore b/.gitignore
index 52d4a58..d726343 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
+/.cache/
+/.tox/
*~
*.tmp
-*.pyc
-*.pyo
+*.py[co]
/MANIFEST
-/SQLObject.egg-info
-/build
-/data
-/dist
-/temp
+/SQLObject.egg-info/
+/build/
+/data/
+/dist/
http://sourceforge.net/p/sqlobject/sqlobject/ci/3fdf20c184044eff4318426b4c5dbe4cbb450f30
commit 3fdf20c184044eff4318426b4c5dbe4cbb450f30
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 22 01:32:35 2016 +0300
Fix py.test warnings by converting yield test to plain calls
yield test were deprecated in py.test.
diff --git a/docs/News.rst b/docs/News.rst
index 4ef98ab..c874a69 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -21,6 +21,9 @@ Tests
* Great Renaming: fix py.test warnings by renaming TestXXX classes
to SOTestXXX to prevent py.test to recognize them as test classes.
+* Fix py.test warnings by converting yield test to plain calls:
+ yield test were deprecated in py.test.
+
* Tests are now run at CIs with python3.5.
* Fix tests under Python 2.7.12 + tox + PostgreSQL.
diff --git a/sqlobject/tests/test_default_style.py b/sqlobject/tests/test_default_style.py
index 3d9d9ad..bd71176 100644
--- a/sqlobject/tests/test_default_style.py
+++ b/sqlobject/tests/test_default_style.py
@@ -61,5 +61,5 @@ class DefaultStyleTest(SQLObject):
def test_default_styles():
make_columns()
for style in styles:
- yield do_col_test, DefaultStyleTest, style, styles[style]
- yield do_fkey_test, DefaultStyleTest, style, fkeys[style]
+ do_col_test(DefaultStyleTest, style, styles[style])
+ do_fkey_test(DefaultStyleTest, style, fkeys[style])
diff --git a/sqlobject/tests/test_sqlbuilder_dbspecific.py b/sqlobject/tests/test_sqlbuilder_dbspecific.py
index 814af01..d8e4913 100644
--- a/sqlobject/tests/test_sqlbuilder_dbspecific.py
+++ b/sqlobject/tests/test_sqlbuilder_dbspecific.py
@@ -35,32 +35,32 @@ def checkCount(q, c, msg=''):
def testSimple():
setupClass(SBButton)
- yield checkCount, makeClause(), 1
- yield checkCount, makeSelect(), 1
+ checkCount(makeClause(), 1)
+ checkCount(makeSelect(), 1)
def testMiscOps():
setupClass(SBButton)
- yield checkCount, AND(makeClause(), makeClause()), 2
- yield checkCount, AND(makeClause(), EXISTS(makeSelect())), 2
+ checkCount(AND(makeClause(), makeClause()), 2)
+ checkCount(AND(makeClause(), EXISTS(makeSelect())), 2)
def testAliased():
setupClass(SBButton)
b = Alias(makeSelect(), 'b')
- yield checkCount, b, 1
- yield checkCount, Select(b.q.id), 1
+ checkCount(b, 1)
+ checkCount(Select(b.q.id), 1)
# Table1 & Table2 are treated individually in joins
- yield checkCount, JOIN(None, b), 1
- yield checkCount, JOIN(b, SBButton), 1
- yield checkCount, JOIN(SBButton, b), 1
- yield checkCount, LEFTJOINOn(None, b, SBButton.q.id == b.q.id), 1
- yield checkCount, LEFTJOINOn(b, SBButton, SBButton.q.id == b.q.id), 1
- yield checkCount, LEFTJOINOn(SBButton, b, SBButton.q.id == b.q.id), 1
+ checkCount(JOIN(None, b), 1)
+ checkCount(JOIN(b, SBButton), 1)
+ checkCount(JOIN(SBButton, b), 1)
+ checkCount(LEFTJOINOn(None, b, SBButton.q.id == b.q.id), 1)
+ checkCount(LEFTJOINOn(b, SBButton, SBButton.q.id == b.q.id), 1)
+ checkCount(LEFTJOINOn(SBButton, b, SBButton.q.id == b.q.id), 1)
def testTablesUsedSResults():
setupClass(SBButton)
- yield checkCount, SBButton.select(makeClause()).queryForSelect(), 1
+ checkCount(SBButton.select(makeClause()).queryForSelect(), 1)
http://sourceforge.net/p/sqlobject/sqlobject/ci/5535bb5c62cb8d4f60bf6c865bd6c3313129ef92
commit 5535bb5c62cb8d4f60bf6c865bd6c3313129ef92
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 22 00:38:09 2016 +0300
Fix py.test warnings by renaming TestXXX classes to SOTestXXX
diff --git a/docs/News.rst b/docs/News.rst
index 0412df1..4ef98ab 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -18,6 +18,9 @@ Documentation
Tests
-----
+* Great Renaming: fix py.test warnings by renaming TestXXX classes
+ to SOTestXXX to prevent py.test to recognize them as test classes.
+
* Tests are now run at CIs with python3.5.
* Fix tests under Python 2.7.12 + tox + PostgreSQL.
diff --git a/sqlobject/inheritance/tests/testDestroyCascade.py b/sqlobject/inheritance/tests/testDestroyCascade.py
index cc138d7..3291127 100644
--- a/sqlobject/inheritance/tests/testDestroyCascade.py
+++ b/sqlobject/inheritance/tests/testDestroyCascade.py
@@ -3,21 +3,21 @@ from sqlobject.inheritance import InheritableSQLObject
from sqlobject.tests.dbtest import setupClass
-class TestCascade1(InheritableSQLObject):
+class SOTestCascade1(InheritableSQLObject):
dummy = IntCol()
-class TestCascade2(TestCascade1):
- c = ForeignKey('TestCascade3', cascade='null')
+class SOTestCascade2(SOTestCascade1):
+ c = ForeignKey('SOTestCascade3', cascade='null')
-class TestCascade3(SQLObject):
+class SOTestCascade3(SQLObject):
dummy = IntCol()
def test_destroySelf():
- setupClass([TestCascade1, TestCascade3, TestCascade2])
+ setupClass([SOTestCascade1, SOTestCascade3, SOTestCascade2])
- c = TestCascade3(dummy=1)
- TestCascade2(cID=c.id, dummy=1)
+ c = SOTestCascade3(dummy=1)
+ SOTestCascade2(cID=c.id, dummy=1)
c.destroySelf()
diff --git a/sqlobject/inheritance/tests/test_aggregates.py b/sqlobject/inheritance/tests/test_aggregates.py
index 9465363..a430aac 100644
--- a/sqlobject/inheritance/tests/test_aggregates.py
+++ b/sqlobject/inheritance/tests/test_aggregates.py
@@ -3,21 +3,21 @@ from sqlobject.inheritance import InheritableSQLObject
from sqlobject.tests.dbtest import raises, setupClass
-class TestAggregate1(InheritableSQLObject):
+class SOTestAggregate1(InheritableSQLObject):
value1 = IntCol()
-class TestAggregate2(TestAggregate1):
+class SOTestAggregate2(SOTestAggregate1):
value2 = IntCol()
def test_aggregates():
- setupClass([TestAggregate1, TestAggregate2])
+ setupClass([SOTestAggregate1, SOTestAggregate2])
- TestAggregate1(value1=1)
- TestAggregate2(value1=2, value2=12)
+ SOTestAggregate1(value1=1)
+ SOTestAggregate2(value1=2, value2=12)
- assert TestAggregate1.select().max("value1") == 2
- assert TestAggregate2.select().max("value1") == 2
- raises(Exception, TestAggregate2.select().max, "value2")
- assert TestAggregate2.select().max(TestAggregate2.q.value2) == 12
+ assert SOTestAggregate1.select().max("value1") == 2
+ assert SOTestAggregate2.select().max("value1") == 2
+ raises(Exception, SOTestAggregate2.select().max, "value2")
+ assert SOTestAggregate2.select().max(SOTestAggregate2.q.value2) == 12
diff --git a/sqlobject/inheritance/tests/test_foreignKey.py b/sqlobject/inheritance/tests/test_foreignKey.py
index 91c7f3b..c1f70e1 100644
--- a/sqlobject/inheritance/tests/test_foreignKey.py
+++ b/sqlobject/inheritance/tests/test_foreignKey.py
@@ -79,16 +79,16 @@ def test_foreignKey():
assert employee.count() == 2
-class TestInheritableBase(InheritableSQLObject):
+class SOTestInheritableBase(InheritableSQLObject):
pass
-class TestInheritableForeignKey(TestInheritableBase):
- base = ForeignKey("TestInheritableBase")
+class SOTestInheritableForeignKey(SOTestInheritableBase):
+ base = ForeignKey("SOTestInheritableBase")
def test_foreignKey2():
- setupClass([TestInheritableBase, TestInheritableForeignKey])
+ setupClass([SOTestInheritableBase, SOTestInheritableForeignKey])
- test = TestInheritableBase()
- TestInheritableForeignKey(base=test)
+ test = SOTestInheritableBase()
+ SOTestInheritableForeignKey(base=test)
diff --git a/sqlobject/tests/test_ForeignKey.py b/sqlobject/tests/test_ForeignKey.py
index a37fef3..0e80275 100644
--- a/sqlobject/tests/test_ForeignKey.py
+++ b/sqlobject/tests/test_ForeignKey.py
@@ -4,120 +4,121 @@ from sqlobject.tests.dbtest import getConnection, InstalledTestDatabase, \
raises, setupClass, setupCyclicClasses
-class TestComposerKey(SQLObject):
+class SOTestComposerKey(SQLObject):
name = StringCol()
id2 = IntCol(default=None, unique=True)
-class TestWorkKey(SQLObject):
+class SOTestWorkKey(SQLObject):
class sqlmeta:
idName = "work_id"
- composer = ForeignKey('TestComposerKey', cascade=True)
+ composer = ForeignKey('SOTestComposerKey', cascade=True)
title = StringCol()
-class TestWorkKey2(SQLObject):
+class SOTestWorkKey2(SQLObject):
title = StringCol()
-class TestOtherColumn(SQLObject):
- key1 = ForeignKey('TestComposerKey', default=None)
- key2 = ForeignKey('TestComposerKey', refColumn='id2', default=None)
+class SOTestOtherColumn(SQLObject):
+ key1 = ForeignKey('SOTestComposerKey', default=None)
+ key2 = ForeignKey('SOTestComposerKey', refColumn='id2', default=None)
def test1():
- setupClass([TestComposerKey, TestWorkKey])
+ setupClass([SOTestComposerKey, SOTestWorkKey])
- c = TestComposerKey(name='Mahler, Gustav')
- w1 = TestWorkKey(composer=c, title='Symphony No. 9')
- w2 = TestWorkKey(composer=None, title=None)
+ c = SOTestComposerKey(name='Mahler, Gustav')
+ w1 = SOTestWorkKey(composer=c, title='Symphony No. 9')
+ w2 = SOTestWorkKey(composer=None, title=None)
# Select by usual way
- s = TestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
+ s = SOTestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
assert s.count() == 1
assert s[0] == w1
# selectBy object.id
- s = TestWorkKey.selectBy(composer=c.id, title='Symphony No. 9')
+ s = SOTestWorkKey.selectBy(composer=c.id, title='Symphony No. 9')
assert s.count() == 1
assert s[0] == w1
# selectBy object
- s = TestWorkKey.selectBy(composer=c, title='Symphony No. 9')
+ s = SOTestWorkKey.selectBy(composer=c, title='Symphony No. 9')
assert s.count() == 1
assert s[0] == w1
# selectBy id
- s = TestWorkKey.selectBy(id=w1.id)
+ s = SOTestWorkKey.selectBy(id=w1.id)
assert s.count() == 1
assert s[0] == w1
# is None handled correctly?
- s = TestWorkKey.selectBy(composer=None, title=None)
+ s = SOTestWorkKey.selectBy(composer=None, title=None)
assert s.count() == 1
assert s[0] == w2
- s = TestWorkKey.selectBy()
+ s = SOTestWorkKey.selectBy()
assert s.count() == 2
# select with objects
- s = TestWorkKey.select(TestWorkKey.q.composerID == c.id)
+ s = SOTestWorkKey.select(SOTestWorkKey.q.composerID == c.id)
assert s.count() == 1
assert s[0] == w1
- s = TestWorkKey.select(TestWorkKey.q.composer == c.id)
+ s = SOTestWorkKey.select(SOTestWorkKey.q.composer == c.id)
assert s.count() == 1
assert s[0] == w1
- s = TestWorkKey.select(TestWorkKey.q.composerID == c)
+ s = SOTestWorkKey.select(SOTestWorkKey.q.composerID == c)
assert s.count() == 1
assert s[0] == w1
- s = TestWorkKey.select(TestWorkKey.q.composer == c)
+ s = SOTestWorkKey.select(SOTestWorkKey.q.composer == c)
assert s.count() == 1
assert s[0] == w1
- s = TestWorkKey.select(
- (TestWorkKey.q.composer == c) &
- (TestWorkKey.q.title == 'Symphony No. 9'))
+ s = SOTestWorkKey.select(
+ (SOTestWorkKey.q.composer == c) &
+ (SOTestWorkKey.q.title == 'Symphony No. 9'))
assert s.count() == 1
assert s[0] == w1
def test2():
- TestWorkKey._connection = getConnection()
- InstalledTestDatabase.drop(TestWorkKey)
- setupClass([TestComposerKey, TestWorkKey2], force=True)
- TestWorkKey2.sqlmeta.addColumn(ForeignKey('TestComposerKey'),
- changeSchema=True)
+ SOTestWorkKey._connection = getConnection()
+ InstalledTestDatabase.drop(SOTestWorkKey)
+ setupClass([SOTestComposerKey, SOTestWorkKey2], force=True)
+ SOTestWorkKey2.sqlmeta.addColumn(ForeignKey('SOTestComposerKey'),
+ changeSchema=True)
def test_otherColumn():
- setupClass([TestComposerKey, TestOtherColumn])
- test_composer1 = TestComposerKey(name='Test1')
- test_composer2 = TestComposerKey(name='Test2', id2=2)
- test_fkey = TestOtherColumn(key1=test_composer1)
- test_other = TestOtherColumn(key2=test_composer2.id2)
+ setupClass([SOTestComposerKey, SOTestOtherColumn])
+ test_composer1 = SOTestComposerKey(name='Test1')
+ test_composer2 = SOTestComposerKey(name='Test2', id2=2)
+ test_fkey = SOTestOtherColumn(key1=test_composer1)
+ test_other = SOTestOtherColumn(key2=test_composer2.id2)
getConnection().cache.clear()
assert test_fkey.key1 == test_composer1
assert test_other.key2 == test_composer2
-class TestFKValidationA(SQLObject):
+class SOTestFKValidationA(SQLObject):
name = StringCol()
- bfk = ForeignKey("TestFKValidationB")
- cfk = ForeignKey("TestFKValidationC", default=None)
+ bfk = ForeignKey("SOTestFKValidationB")
+ cfk = ForeignKey("SOTestFKValidationC", default=None)
-class TestFKValidationB(SQLObject):
+class SOTestFKValidationB(SQLObject):
name = StringCol()
- afk = ForeignKey("TestFKValidationA")
+ afk = ForeignKey("SOTestFKValidationA")
-class TestFKValidationC(SQLObject):
+class SOTestFKValidationC(SQLObject):
class sqlmeta:
idType = str
name = StringCol()
def test_foreignkey_validation():
- setupCyclicClasses(TestFKValidationA, TestFKValidationB, TestFKValidationC)
- a = TestFKValidationA(name="testa", bfk=None)
- b = TestFKValidationB(name="testb", afk=a)
- c = TestFKValidationC(id='testc', name="testc")
+ setupCyclicClasses(SOTestFKValidationA, SOTestFKValidationB,
+ SOTestFKValidationC)
+ a = SOTestFKValidationA(name="testa", bfk=None)
+ b = SOTestFKValidationB(name="testb", afk=a)
+ c = SOTestFKValidationC(id='testc', name="testc")
a.bfk = b
a.cfk = c
assert a.bfk == b
@@ -125,8 +126,8 @@ def test_foreignkey_validation():
assert b.afk == a
raises(validators.Invalid,
- TestFKValidationA, name="testa", bfk='testb', cfk='testc')
+ SOTestFKValidationA, name="testa", bfk='testb', cfk='testc')
- a = TestFKValidationA(name="testa", bfk=1, cfk='testc')
+ a = SOTestFKValidationA(name="testa", bfk=1, cfk='testc')
assert a.bfkID == 1
assert a.cfkID == 'testc'
diff --git a/sqlobject/tests/test_NoneValuedResultItem.py b/sqlobject/tests/test_NoneValuedResultItem.py
index 3e29636..9a6dc5d 100644
--- a/sqlobject/tests/test_NoneValuedResultItem.py
+++ b/sqlobject/tests/test_NoneValuedResultItem.py
@@ -4,28 +4,30 @@ from sqlobject import ForeignKey, SQLObject, StringCol, sqlbuilder
from sqlobject.tests.dbtest import setupClass
-class TestComposer(SQLObject):
+class SOTestComposer(SQLObject):
name = StringCol()
-class TestWork(SQLObject):
+class SOTestWork(SQLObject):
class sqlmeta:
idName = "work_id"
- composer = ForeignKey('TestComposer')
+ composer = ForeignKey('SOTestComposer')
title = StringCol()
def test1():
- setupClass([TestComposer,
- TestWork])
+ setupClass([SOTestComposer,
+ SOTestWork])
- c = TestComposer(name='Mahler, Gustav')
- w = TestWork(composer=c, title='Symphony No. 9')
- TestComposer(name='Bruckner, Anton')
+ c = SOTestComposer(name='Mahler, Gustav')
+ w = SOTestWork(composer=c, title='Symphony No. 9')
+ SOTestComposer(name='Bruckner, Anton')
# but don't add any works for Bruckner
# do a left join, a common use case that often involves NULL results
- s = TestWork.select(join=sqlbuilder.LEFTJOINOn(TestComposer, TestWork,
- TestComposer.q.id == TestWork.q.composerID))
+ s = SOTestWork.select(
+ join=sqlbuilder.LEFTJOINOn(
+ SOTestComposer, SOTestWork,
+ SOTestComposer.q.id == SOTestWork.q.composerID))
assert tuple(s) == (w, None)
diff --git a/sqlobject/tests/test_asdict.py b/sqlobject/tests/test_asdict.py
index 262f189..c6b3827 100644
--- a/sqlobject/tests/test_asdict.py
+++ b/sqlobject/tests/test_asdict.py
@@ -7,12 +7,12 @@ from sqlobject.tests.dbtest import setupClass
########################################
-class TestAsDict(SQLObject):
+class SOTestAsDict(SQLObject):
name = StringCol(length=10)
name2 = StringCol(length=10)
def test_asDict():
- setupClass(TestAsDict, force=True)
- t1 = TestAsDict(name='one', name2='1')
+ setupClass(SOTestAsDict, force=True)
+ t1 = SOTestAsDict(name='one', name2='1')
assert t1.sqlmeta.asDict() == dict(name='one', name2='1', id=1)
diff --git a/sqlobject/tests/test_basic.py b/sqlobject/tests/test_basic.py
index 5a12044..fff3f2e 100644
--- a/sqlobject/tests/test_basic.py
+++ b/sqlobject/tests/test_basic.py
@@ -5,7 +5,7 @@ from sqlobject import BoolCol, ForeignKey, IntCol, KeyCol, SQLObject, \
from sqlobject.tests.dbtest import inserts, raises, setupClass, supports
... 1913 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
