Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 6b611ec3f1e4bd766780612fa635f3fa6d269b59
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Oct 23 18:17:43 2014 +0200
[backend] Action::delete_build passing username/projectname to createrepo, updated
tests
---------------------------------------------------------------
backend/backend/actions.py | 7 +++++--
backend/backend/mockremote.py | 3 ++-
backend/tests/test_action.py | 12 +++++++++---
backend/tests/test_createrepo.py | 1 -
.../coprs_frontend/coprs/logic/builds_logic.py | 2 +-
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/backend/backend/actions.py b/backend/backend/actions.py
index 3da35e7..ec2425e 100644
--- a/backend/backend/actions.py
+++ b/backend/backend/actions.py
@@ -111,8 +111,11 @@ class Action(object):
if altered:
self.event("Running createrepo")
- _, _, err = createrepo(path=os.path.join(path, chroot),
lock=self.lock,
- front_url=self.front_url)
+ _, _, err = createrepo(
+ path=os.path.join(path, chroot), lock=self.lock,
+ front_url=self.front_url,
+ username=ext_data["username"],
projectname=ext_data["projectname"]
+ )
if err.strip():
self.event(
"Error making local repo: {0}".format(err))
diff --git a/backend/backend/mockremote.py b/backend/backend/mockremote.py
index bb5d8cb..4b8b410 100755
--- a/backend/backend/mockremote.py
+++ b/backend/backend/mockremote.py
@@ -59,8 +59,9 @@ DEF_DESTDIR = os.getcwd()
DEF_MACROS = {}
DEF_BUILDROOT_PKGS = ""
+from .createrepo import createrepo
-def createrepo(path, lock=None):
+def createrepo_orig(path, lock=None):
comm = ['/usr/bin/createrepo_c', '--database',
'--ignore-lock']
if os.path.exists(path + '/repodata/repomd.xml'):
comm.append("--update")
diff --git a/backend/tests/test_action.py b/backend/tests/test_action.py
index e0c4515..4cb1b70 100644
--- a/backend/tests/test_action.py
+++ b/backend/tests/test_action.py
@@ -51,6 +51,12 @@ class TestAction(object):
self.pkgs = ["foo.src.rpm", "bar.src.rpm"]
self.pkgs_stripped = ["foo", "bar"]
+ self.ext_data_for_delete_build = json.dumps({
+ "pkgs": " ".join(self.pkgs),
+ "username": "foo",
+ "projectname": "bar"
+ })
+
def teardown_method(self, method):
self.rm_tmp_dir()
@@ -292,7 +298,7 @@ class TestAction(object):
"object_type": obj_type,
"id": 7,
"old_value": "not-existing-project",
- "data": json.dumps({"pkgs": "
".join(self.pkgs)}),
+ "data": self.ext_data_for_delete_build,
},
events=self.test_q, lock=None,
frontend_callback=mc_front_cb,
@@ -349,7 +355,7 @@ class TestAction(object):
"object_type": "build-succeeded",
"id": 7,
"old_value": "old_dir",
- "data": json.dumps({"pkgs": "
".join(self.pkgs)}),
+ "data": self.ext_data_for_delete_build,
"object_id": 42
},
events=self.test_q, lock=None,
@@ -429,7 +435,7 @@ class TestAction(object):
"object_type": "build-succeeded",
"id": 7,
"old_value": "old_dir",
- "data": json.dumps({"pkgs": "
".join(self.pkgs)}),
+ "data": self.ext_data_for_delete_build,
"object_id": 42
},
events=self.test_q, lock=None,
diff --git a/backend/tests/test_createrepo.py b/backend/tests/test_createrepo.py
index 01762b4..d9e8d8f 100644
--- a/backend/tests/test_createrepo.py
+++ b/backend/tests/test_createrepo.py
@@ -122,7 +122,6 @@ class TestCreaterepoUnsafe(object):
createrepo_unsafe(path, None)
assert mc_popen.call_args == mock.call(expected, stderr=-1, stdout=-1)
-
def test_createrepo_devel_generated_commands_existing_repodata(self, mc_popen):
mc_popen.return_value.communicate.return_value = ("", "")
diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py
b/frontend/coprs_frontend/coprs/logic/builds_logic.py
index e1907ec..ef3a97b 100644
--- a/frontend/coprs_frontend/coprs/logic/builds_logic.py
+++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py
@@ -214,7 +214,7 @@ class BuildsLogic(object):
object_type = "build-{0}".format(build.state)
data_dict = {"pkgs": build.pkgs,
"username": build.copr.owner.name,
- "project": build.copr.name}
+ "projectname": build.copr.name}
action =
models.Action(action_type=helpers.ActionTypeEnum("delete"),
object_type=object_type,