[copr] master: Automatic commit of package [copr-selinux] release [1.32-1]. (b154678)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit b154678bacf9ef63c97eb609d10e48be71524372
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 13 14:49:53 2014 +0200
Automatic commit of package [copr-selinux] release [1.32-1].
>---------------------------------------------------------------
rel-eng/packages/copr-selinux | 2 +-
selinux/copr-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/rel-eng/packages/copr-selinux b/rel-eng/packages/copr-selinux
index 1d2c9c8..36dbafa 100644
--- a/rel-eng/packages/copr-selinux
+++ b/rel-eng/packages/copr-selinux
@@ -1 +1 @@
-1.31-1 selinux/
+1.32-1 selinux/
diff --git a/selinux/copr-selinux.spec b/selinux/copr-selinux.spec
index 52165df..538605a 100644
--- a/selinux/copr-selinux.spec
+++ b/selinux/copr-selinux.spec
@@ -8,7 +8,7 @@
%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)}
Name: copr-selinux
-Version: 1.31
+Version: 1.32
Release: 1%{?dist}
Summary: SELinux module for COPR
@@ -110,6 +110,9 @@ fi
%{_mandir}/man8/%{name}-relabel.8*
%changelog
+* Mon Oct 13 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.32-1
+- 1077795 - spec cleanup
+
* Wed May 21 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.31-1
- follow selinux packaging draft
9 years, 7 months
[copr] master: 1077795 - spec cleanup (e0eee93)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit e0eee93b78b5972dc8e02e2f202217e25dd785a3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 13 14:49:43 2014 +0200
1077795 - spec cleanup
>---------------------------------------------------------------
selinux/copr-selinux.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/selinux/copr-selinux.spec b/selinux/copr-selinux.spec
index 321040a..52165df 100644
--- a/selinux/copr-selinux.spec
+++ b/selinux/copr-selinux.spec
@@ -27,7 +27,7 @@ BuildArch: noarch
BuildRequires: asciidoc
BuildRequires: libxslt
BuildRequires: checkpolicy, selinux-policy-devel
-BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
+BuildRequires: policycoreutils
Requires(post): policycoreutils, libselinux-utils
Requires(post): policycoreutils-python
Requires(post): selinux-policy-targeted
@@ -70,7 +70,7 @@ done
install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
install -p -m 644 %{modulename}.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-# Install copr-selinux-enable which will be called in %posttrans
+# Install copr-selinux-enable which will be called in %%posttrans
install -d %{buildroot}%{_sbindir}
install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable
install -p -m 755 %{name}-relabel %{buildroot}%{_sbindir}/%{name}-relabel
@@ -97,7 +97,7 @@ if [ $1 -eq 0 ]; then
&& /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
done
fi
-%{sbinpath}/restorecon -rvvi %{_sharedstatedir}/copr
+%{_sbindir}/restorecon -rvvi %{_sharedstatedir}/copr
%files
%doc LICENSE
9 years, 7 months
[copr] master: Added stub for backend tests (99274c2)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 99274c21cb62078ecdfd096d060dc5ecba4c3ea8
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Oct 9 21:56:48 2014 +0200
Added stub for backend tests
>---------------------------------------------------------------
.../tests/test_mockremote.py | 0
test_suite.sh | 13 ++++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/logic/__init__.py b/backend/tests/test_mockremote.py
similarity index 100%
copy from frontend/coprs_frontend/coprs/logic/__init__.py
copy to backend/tests/test_mockremote.py
diff --git a/test_suite.sh b/test_suite.sh
index 1cc3e10..a2a19e1 100644
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -21,16 +21,19 @@ pip install -r keygen/requirements.txt
mkdir -p _report
-python -m pytest python/copr --junitxml=_report/python-copr.junit.xml --cov-report xml --cov python/copr/client
+COPR_CONFIG="$(pwd)/frontend/coprs_frontend/config/copr_unit_test.conf" \
+ python -m pytest frontend/coprs_frontend/tests --junitxml=_report/frontend.junit.xml --cov-report xml --cov frontend/coprs_frontend/coprs
+mv {,_report/frontend.}coverage.xml
+
+python -m pytest backend/tests --junitxml=_report/backend.junit.xml --cov-report xml --cov backend/backend
+mv {,_report/backend.}coverage.xml
+
+python -m pytest python/copr/test --junitxml=_report/python-copr.junit.xml --cov-report xml --cov python/copr/client
mv {,_report/python-copr.}coverage.xml
PYTHONPATH=python/:cli/:$PYTHONPATH python -m pytest cli/tests --junitxml=_report/cli.junit.xml --cov-report xml --cov cli/copr_cli
mv {,_report/cli.}coverage.xml
-COPR_CONFIG="$(pwd)/frontend/coprs_frontend/config/copr_unit_test.conf" \
- python -m pytest frontend/coprs_frontend/tests --junitxml=_report/frontend.junit.xml --cov-report xml --cov frontend/coprs_frontend/coprs
-mv {,_report/frontend.}coverage.xml
-
PYTHONPATH=keygen/src:$PYTHONPATH python -B -m pytest keygen/tests --junitxml=_report/keygen.junit.xml --cov-report xml --cov keygen/src
mv {,_report/keygen.}coverage.xml
9 years, 7 months
[copr] master: [keygen] [.spec] fixes to follow Fedora packaging guidelines (78732f0)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 78732f0b0590861bf409f7445b17e1798700a600
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Oct 9 13:18:34 2014 +0200
[keygen] [.spec] fixes to follow Fedora packaging guidelines
>---------------------------------------------------------------
keygen/copr-keygen.spec | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/keygen/copr-keygen.spec b/keygen/copr-keygen.spec
index 64c6545..b386b57 100644
--- a/keygen/copr-keygen.spec
+++ b/keygen/copr-keygen.spec
@@ -9,7 +9,7 @@
Name: copr-keygen
Version: 1.58
Release: 1%{?dist}
-Summary: Part of Copr build system. Aux service that generate keys for sign.
+Summary: Part of Copr build system. Aux service that generate keys for signd
Group: Applications/Productivity
License: GPLv2+
@@ -64,7 +64,7 @@ This package contains aux service that generate keys for package signing.
%if 0%{?fedora}
%package -n copr-keygen-doc
-Summary: Code documentation for copr-keygen component of Copr buildsystem.
+Summary: Code documentation for copr-keygen component of Copr buildsystem
Obsoletes: copr-doc < 1.38
BuildRequires: python-devel
@@ -98,6 +98,7 @@ CFLAGS="%{optflags}" %{__python3} setup.py build
# build documentation
pushd docs
make %{?_smp_mflags} html
+rm _build/html/.buildinfo
popd
%endif # ?fedora
@@ -119,9 +120,9 @@ install -d -m 500 %{buildroot}%{_sharedstatedir}/copr-keygen/phrases
install -d -m 500 %{buildroot}%{_sharedstatedir}/copr-keygen/gnupg
install -d %{buildroot}%{_localstatedir}/log/copr-keygen
-%{__install} -p -m 0644 run/gpg_copr.sh %{buildroot}/%{_bindir}/gpg_copr.sh
+%{__install} -p -m 0755 run/gpg_copr.sh %{buildroot}/%{_bindir}/gpg_copr.sh
-%{__install} -p -m 0644 run/application.py %{buildroot}%{_datadir}/copr-keygen/
+%{__install} -p -m 0755 run/application.py %{buildroot}%{_datadir}/copr-keygen/
%{__install} -p -m 0644 configs/httpd/copr-keygen.conf.example %{buildroot}%{_pkgdocdir}/httpd/
%{__install} -p -m 0644 configs/sign/sign.conf.example %{buildroot}%{_pkgdocdir}/sign/sign.conf.example
@@ -158,7 +159,7 @@ service httpd condrestart
%{python3_sitelib}/*
%{_bindir}/gpg_copr.sh
-
+%config(noreplace) %{_sysconfdir}/sudoers.d/copr_signer
%defattr(600, copr-signer, copr-signer, 700)
%{_sharedstatedir}/copr-keygen
@@ -166,9 +167,6 @@ service httpd condrestart
%{_localstatedir}/log/copr-keygen/
%ghost %{_localstatedir}/log/copr-keygen/main.log
-%defattr(600, root, root)
-%config(noreplace) %{_sysconfdir}/sudoers.d/copr_signer
-
%files -n copr-keygen-doc
%doc %{_pkgdocdir}
9 years, 7 months
[copr] master: Added script to automate tests execution inside virtualenv. Updated */requirements.txt. (29efb9e)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 29efb9ef2d66e982fc553c3fb1479e97a0a70d78
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Oct 9 10:59:07 2014 +0200
Added script to automate tests execution inside virtualenv. Updated */requirements.txt.
>---------------------------------------------------------------
.gitignore | 3 +--
frontend/coprs_frontend/config/copr_unit_test.conf | 6 +++++-
frontend/requirements.txt | 1 +
test_suite.sh | 16 +++++++++++++---
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index a59061d..d54326b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,5 @@ python-doc/
documentation/build
documentation/python-doc
_venv/
-*.junit.xml
-coverage.xml
+_report/
diff --git a/frontend/coprs_frontend/config/copr_unit_test.conf b/frontend/coprs_frontend/config/copr_unit_test.conf
index 85e12ae..2f29680 100644
--- a/frontend/coprs_frontend/config/copr_unit_test.conf
+++ b/frontend/coprs_frontend/config/copr_unit_test.conf
@@ -1,6 +1,10 @@
# Directory and files where is stored Copr database files
DATA_DIR = '/tmp'
-DATABASE = '/tmp/copr.db'
+
+import time
+#DATABASE = '/tmp/copr.db' # when executing >1 test instances use different db
+DATABASE = '/tmp/copr_{}.db'.format(time.time())
+
OPENID_STORE = '/tmp/openid_store'
WHOOSHEE_DIR = '/tmp/whooshee'
diff --git a/frontend/requirements.txt b/frontend/requirements.txt
index 70cba07..966de85 100644
--- a/frontend/requirements.txt
+++ b/frontend/requirements.txt
@@ -3,6 +3,7 @@ Flask-OpenID
Flask-SQLAlchemy==1.0
Flask-Script
Flask-WTF
+flask-whooshee==0.0.6
SQLAlchemy==0.8.7
pytest
pytest-cov
diff --git a/test_suite.sh b/test_suite.sh
index 628216b..1cc3e10 100644
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -6,6 +6,7 @@ find . -path '*/__pycache__' | xargs rm -rfv
virtualenv _venv
source _venv/bin/activate
+
pip install pytest mock pytest-cov sphinx flask flask-script SQLAlchemy==0.8.7 flask-whooshee Flask-OpenID Flask-SQLAlchemy==1.0 Flask-WTF blinker pytz markdown pyLibravatar pydns flexmock whoosh decorator
@@ -15,14 +16,23 @@ cp -rv /usr/lib64/python2.7/site-packages/rpm _venv/lib/python2.7/site-packages/
pip install -r python/requirements.txt
pip install -r cli/requirements.txt
pip install -r frontend/requirements.txt
+pip install -r keygen/requirements.txt
+
+mkdir -p _report
-python -m pytest python/copr --junitxml=python-copr.junit.xml --cov-report xml --cov python/copr/client
+python -m pytest python/copr --junitxml=_report/python-copr.junit.xml --cov-report xml --cov python/copr/client
+mv {,_report/python-copr.}coverage.xml
-PYTHONPATH=python/:cli/:$PYTHONPATH python -m pytest cli/tests --junitxml=cli.junit.xml --cov-report xml --cov cli/copr_cli
+PYTHONPATH=python/:cli/:$PYTHONPATH python -m pytest cli/tests --junitxml=_report/cli.junit.xml --cov-report xml --cov cli/copr_cli
+mv {,_report/cli.}coverage.xml
COPR_CONFIG="$(pwd)/frontend/coprs_frontend/config/copr_unit_test.conf" \
- python -m pytest frontend/coprs_frontend/tests --junitxml=frontend.junit.xml --cov-report xml --cov frontend/coprs_frontend/coprs
+ python -m pytest frontend/coprs_frontend/tests --junitxml=_report/frontend.junit.xml --cov-report xml --cov frontend/coprs_frontend/coprs
+mv {,_report/frontend.}coverage.xml
+
+PYTHONPATH=keygen/src:$PYTHONPATH python -B -m pytest keygen/tests --junitxml=_report/keygen.junit.xml --cov-report xml --cov keygen/src
+mv {,_report/keygen.}coverage.xml
deactivate
9 years, 7 months
[copr] master: A few fixes for CI (b16ab42)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit b16ab42c04cf98d26c87db6a89ffae666bec29d4
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Wed Oct 8 17:59:07 2014 +0200
A few fixes for CI
>---------------------------------------------------------------
.gitignore | 4 +++
cli/{cli_requirements.txt => requirements.txt} | 0
cli/tests/test_cli.py | 2 +-
frontend/requirements.txt | 15 ++++++++++++
python/requirements.txt | 2 +
test_suite.sh | 29 ++++++++++++++++++++++++
6 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/.gitignore b/.gitignore
index bfa76cc..a59061d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ python-doc/
*.egg-info
documentation/build
documentation/python-doc
+_venv/
+*.junit.xml
+coverage.xml
+
diff --git a/cli/cli_requirements.txt b/cli/requirements.txt
similarity index 100%
rename from cli/cli_requirements.txt
rename to cli/requirements.txt
diff --git a/cli/tests/test_cli.py b/cli/tests/test_cli.py
index 86a2ccc..92ca091 100644
--- a/cli/tests/test_cli.py
+++ b/cli/tests/test_cli.py
@@ -194,7 +194,7 @@ def read_res(name):
@mock.patch('copr_cli.main.CoprClient')
def test_list_project(mock_cc, capsys):
- response_data = json.load(open('tests/resources/list_projects_response.json'))
+ response_data = json.loads(read_res('list_projects_response.json'))
expected_output = read_res('list_projects_expected.txt')
# no config
diff --git a/frontend/requirements.txt b/frontend/requirements.txt
new file mode 100644
index 0000000..70cba07
--- /dev/null
+++ b/frontend/requirements.txt
@@ -0,0 +1,15 @@
+Flask
+Flask-OpenID
+Flask-SQLAlchemy==1.0
+Flask-Script
+Flask-WTF
+SQLAlchemy==0.8.7
+pytest
+pytest-cov
+blinker
+pytz
+markdown
+pyLibravatar
+pydns
+flexmock
+decorator
diff --git a/python/requirements.txt b/python/requirements.txt
index 3c66803..0e941ee 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,6 +1,8 @@
# Used for when working from a virtualenv.
# Use this file by running "$ pip install -r requirements.txt"
+pytest
+mock
six
requests
sphinx
diff --git a/test_suite.sh b/test_suite.sh
new file mode 100644
index 0000000..628216b
--- /dev/null
+++ b/test_suite.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+find . -path '*/__pycache__' | xargs rm -rfv
+
+#pip install --user virtualenv
+
+virtualenv _venv
+source _venv/bin/activate
+
+pip install pytest mock pytest-cov sphinx flask flask-script SQLAlchemy==0.8.7 flask-whooshee Flask-OpenID Flask-SQLAlchemy==1.0 Flask-WTF blinker pytz markdown pyLibravatar pydns flexmock whoosh decorator
+
+
+cp -rv /usr/lib/python2.7/site-packages/rpmUtils _venv/lib/python2.7/site-packages/
+cp -rv /usr/lib64/python2.7/site-packages/rpm _venv/lib/python2.7/site-packages/
+
+pip install -r python/requirements.txt
+pip install -r cli/requirements.txt
+pip install -r frontend/requirements.txt
+
+
+python -m pytest python/copr --junitxml=python-copr.junit.xml --cov-report xml --cov python/copr/client
+
+PYTHONPATH=python/:cli/:$PYTHONPATH python -m pytest cli/tests --junitxml=cli.junit.xml --cov-report xml --cov cli/copr_cli
+
+COPR_CONFIG="$(pwd)/frontend/coprs_frontend/config/copr_unit_test.conf" \
+ python -m pytest frontend/coprs_frontend/tests --junitxml=frontend.junit.xml --cov-report xml --cov frontend/coprs_frontend/coprs
+
+deactivate
+
+
9 years, 7 months
[copr] master: Automatic commit of package [copr-cli] release [1.38-1]. (c3cb527)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit c3cb5272a97666e6540a472698a1386332aaba86
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Tue Oct 7 17:58:24 2014 +0200
Automatic commit of package [copr-cli] release [1.38-1].
>---------------------------------------------------------------
cli/copr-cli.spec | 8 +++++++-
rel-eng/packages/copr-cli | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cli/copr-cli.spec b/cli/copr-cli.spec
index 083a4ad..7b227fc 100644
--- a/cli/copr-cli.spec
+++ b/cli/copr-cli.spec
@@ -4,7 +4,7 @@
%endif
Name: copr-cli
-Version: 1.37
+Version: 1.38
Release: 1%{?dist}
Summary: Command line interface for COPR
@@ -87,6 +87,12 @@ install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
%endif
%changelog
+* Tue Oct 07 2014 Valentin Gologuzov <vgologuz(a)redhat.com> 1.38-1
+- [cli] Added symlink for executable: copr -> copr-cli
+- [cli] removed epydoc documentation
+- [python-copr, cli] test coverage
+- [python-copr, cli] updating copr-cli to use python-copr
+
* Thu Sep 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.37-1
- [python-copr] Renamed package: python-copr-client -> python-copr
- [cli] In case of missing config show proper message, hide traceback.
diff --git a/rel-eng/packages/copr-cli b/rel-eng/packages/copr-cli
index e979ceb..7557165 100644
--- a/rel-eng/packages/copr-cli
+++ b/rel-eng/packages/copr-cli
@@ -1 +1 @@
-1.37-1 cli/
+1.38-1 cli/
9 years, 7 months