From 73940b430a655814f8f92dd8f8d033f0247b626a Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 4 Oct 2016 16:50:46 -0700 Subject: add tests for epel-rpm-macros-6-14 (%py3_ stubs) Signed-off-by: Tim Orling --- Dockerfile | 2 +- tests/test_bz1369486.py | 39 -------------------------------------- tests/test_epel-rpm-macros-6-14.py | 39 ++++++++++++++++++++++++++++++++++++++ tests/test_rhbz1369486.py | 39 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 40 deletions(-) delete mode 100644 tests/test_bz1369486.py create mode 100644 tests/test_epel-rpm-macros-6-14.py create mode 100644 tests/test_rhbz1369486.py diff --git a/Dockerfile b/Dockerfile index 109d153..308f9d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,6 @@ RUN yum -y install epel-release; yum clean all RUN yum -y install rpm python python-pip epel-rpm-macros python-rpm-macros; yum clean all RUN yum -y update --enablerepo=epel-testing RUN pip install -U pytest -COPY tests/test_bz1369486.py tests/test_bz1369486.py +COPY tests/* tests/ CMD ["pytest", "tests/"] diff --git a/tests/test_bz1369486.py b/tests/test_bz1369486.py deleted file mode 100644 index 0817bc1..0000000 --- a/tests/test_bz1369486.py +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2016 Intel Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# 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 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -import os -import pytest -import shlex -from subprocess import Popen, PIPE - -class TestPython2Macros: - - @pytest.fixture - def python2_version_macro(self): - cmd = shlex.split("rpm -E %python2_version") - output = Popen(cmd, stdout=PIPE).communicate()[0] - return output - - @pytest.fixture - def python2_version_nodots_macro(self): - cmd = shlex.split("rpm -E %python2_version_nodots") - output = Popen(cmd, stdout=PIPE).communicate()[0] - return output - - def test_python2_version_macro(self, python2_version_macro): - assert python2_version_macro == '2.6\n' - - def test_python2_version_nodots_macro(self, python2_version_nodots_macro): - assert python2_version_nodots_macro == '26\n' diff --git a/tests/test_epel-rpm-macros-6-14.py b/tests/test_epel-rpm-macros-6-14.py new file mode 100644 index 0000000..85adf8d --- /dev/null +++ b/tests/test_epel-rpm-macros-6-14.py @@ -0,0 +1,39 @@ +# Copyright (C) 2016 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# 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 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., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os +import pytest +import shlex +from subprocess import Popen, PIPE + +class TestPython3Stubs: + + @pytest.fixture + def py3_build_macro(self): + cmd = shlex.split("rpm -E %py3_build") + output = Popen(cmd, stdout=PIPE).communicate()[0] + return output + + @pytest.fixture + def py3_install_macro(self): + cmd = shlex.split("rpm -E %py3_install") + output = Popen(cmd, stdout=PIPE).communicate()[0] + return output + + def test_py3_build_macro(self, py3_build_macro): + assert py3_build_macro != '\n' + + def test_py3_install_macro(self, py3_install_macro): + assert py3_install_macro != '\n' diff --git a/tests/test_rhbz1369486.py b/tests/test_rhbz1369486.py new file mode 100644 index 0000000..0817bc1 --- /dev/null +++ b/tests/test_rhbz1369486.py @@ -0,0 +1,39 @@ +# Copyright (C) 2016 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# 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 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., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os +import pytest +import shlex +from subprocess import Popen, PIPE + +class TestPython2Macros: + + @pytest.fixture + def python2_version_macro(self): + cmd = shlex.split("rpm -E %python2_version") + output = Popen(cmd, stdout=PIPE).communicate()[0] + return output + + @pytest.fixture + def python2_version_nodots_macro(self): + cmd = shlex.split("rpm -E %python2_version_nodots") + output = Popen(cmd, stdout=PIPE).communicate()[0] + return output + + def test_python2_version_macro(self, python2_version_macro): + assert python2_version_macro == '2.6\n' + + def test_python2_version_nodots_macro(self, python2_version_nodots_macro): + assert python2_version_nodots_macro == '26\n' -- cgit