# HG changeset patch # User Rémi Cardona # Date 1449766841 -3600 # Node ID b1ba18016151b75adf63580f29f191f0ffd39eeb # Parent bf381a894cd3540ff89dbf3495750ee453ea0bdf [skeleton] Fix broken spec file template Broken in commit 73c1c9cf6bda. diff -r bf381a894cd3 -r b1ba18016151 devtools/test/unittest_devctl.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devtools/test/unittest_devctl.py Thu Dec 10 18:00:41 2015 +0100 @@ -0,0 +1,47 @@ +# copyright 2003-2015 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr +# +# This file is part of CubicWeb. +# +# CubicWeb is free software: you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free +# Software Foundation, either version 2.1 of the License, or (at your option) +# any later version. +# +# CubicWeb 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 Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License along +# with CubicWeb. If not, see . +"""unit tests for cubicweb-ctl commands from devtools""" + +import os.path as osp +import sys +import tempfile +import shutil +from subprocess import Popen, PIPE, STDOUT +from unittest import TestCase + + +class CubicWebCtlTC(TestCase): + """test case for devtools commands""" + + def test_newcube(self): + cwctl = osp.abspath(osp.join(osp.dirname(__file__), '../../bin/cubicweb-ctl')) + + tmpdir = tempfile.mkdtemp(prefix="temp-cwctl-newcube") + try: + cmd = [sys.executable, cwctl, 'newcube', + '--directory', tmpdir, 'foo'] + proc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=STDOUT) + stdout, _ = proc.communicate(b'short_desc\n') + finally: + shutil.rmtree(tmpdir, ignore_errors=True) + self.assertEqual(proc.returncode, 0, msg=stdout) + + +if __name__ == '__main__': + from unittest import main + main() diff -r bf381a894cd3 -r b1ba18016151 skeleton/DISTNAME.spec.tmpl --- a/skeleton/DISTNAME.spec.tmpl Thu Dec 10 17:50:46 2015 +0100 +++ b/skeleton/DISTNAME.spec.tmpl Thu Dec 10 18:00:41 2015 +0100 @@ -21,7 +21,7 @@ BuildRequires: %%{python} %%{python}-setuptools Requires: cubicweb >= %(version)s -Requires: %{python}-six >= 1.4.0 +Requires: %%{python}-six >= 1.4.0 %%description %(longdesc)s