2 commits - kolabtest.py pykolab.spec.in

[Jeroen van Meeuwen]

 kolabtest.py    |   41 -----------------------------------------
 pykolab.spec.in |    4 ++--
 2 files changed, 2 insertions(+), 43 deletions(-)

New commits:
commit 0462630173579c7ddc9a3a3e27e99c841b300ea2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jul 20 10:37:45 2012 +0100

    Remove obsolete kolabtest.py

diff --git a/kolabtest.py b/kolabtest.py
deleted file mode 100755
index 4c3e954..0000000
--- a/kolabtest.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2010-2012 Kolab Systems AG (http://www.kolabsys.com)
-#
-# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-import logging
-import os
-import sys
-
-# For development purposes
-sys.path.append('.')
-
-from pykolab.translate import _
-from pykolab.tests import *
-
-try:
-    import pykolab.constants
-except ImportError, e:
-    print >> sys.stderr, _("Cannot load pykolab/constants.py:")
-    print >> sys.stderr, "%s" % e
-    sys.exit(1)
-
-if __name__ == "__main__":
-    kolab = Tests()
-    kolab.run()
-


commit 744e5ee8c207354421c0803b49f602cf66bd3cf8
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jul 20 10:35:38 2012 +0100

    Correct the running of tests in %check to only include unit tests

diff --git a/pykolab.spec.in b/pykolab.spec.in
index c23704e..90986cf 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -266,9 +266,9 @@ fi
 %check
 # RHEL's python unittest does not have assertIsInstance()
 %if 0%{?rhel} > 1
-nosetests -v tests/ ||:
+nosetests -v tests/unit/ ||:
 %else
-nosetests -v tests/
+nosetests -v tests/unit/
 %endif
 
 %clean