# HG changeset patch # User Sylvain Thénault # Date 1284019685 -7200 # Node ID 12fdccedab5a2b174d806cce9a85935c0013d21a # Parent a0c4441e6ddf06595449350b595a1d3db38d9026 cleanups diff -r a0c4441e6ddf -r 12fdccedab5a rset.py --- a/rset.py Thu Sep 09 10:08:04 2010 +0200 +++ b/rset.py Thu Sep 09 10:08:05 2010 +0200 @@ -569,7 +569,8 @@ if i == col: continue coletype = self.description[row][i] - # None description possible on column resulting from an outer join + # None description possible on column resulting from an + # outer join if coletype is None or eschema(coletype).final: continue try: diff -r a0c4441e6ddf -r 12fdccedab5a server/test/unittest_querier.py --- a/server/test/unittest_querier.py Thu Sep 09 10:08:04 2010 +0200 +++ b/server/test/unittest_querier.py Thu Sep 09 10:08:05 2010 +0200 @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU Lesser General Public License along # with CubicWeb. If not, see . -"""unit tests for modules cubicweb.server.querier and cubicweb.server.querier_steps +"""unit tests for modules cubicweb.server.querier and cubicweb.server.ssplanner """ from datetime import date, datetime @@ -683,12 +683,10 @@ def test_select_ordered_distinct_2(self): self.execute("INSERT Affaire X: X sujet 'minor'") - self.execute("INSERT Affaire X: X sujet 'important'") - self.execute("INSERT Affaire X: X sujet 'normal'") self.execute("INSERT Affaire X: X sujet 'zou'") self.execute("INSERT Affaire X: X sujet 'abcd'") rset = self.execute('DISTINCT Any S ORDERBY S WHERE A is Affaire, A sujet S') - self.assertEqual(rset.rows, [['abcd'], ['important'], ['minor'], ['normal'], ['zou']]) + self.assertEqual(rset.rows, [['abcd'], ['minor'], ['zou']]) def test_select_ordered_distinct_3(self): rset = self.execute('DISTINCT Any N ORDERBY GROUP_SORT_VALUE(N) WHERE X is CWGroup, X name N')