[copr] master: Finish generalization of Action by renaming backend_result to result (f553221)

bkabrda at fedoraproject.org bkabrda at fedoraproject.org
Wed Apr 3 08:13:52 UTC 2013


Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : master

>---------------------------------------------------------------

commit f5532213a344b0b2ddaa424d6965f015c5a5d554
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Wed Apr 3 10:13:24 2013 +0200

    Finish generalization of Action by renaming backend_result to result


>---------------------------------------------------------------

 .../d062c3d9c00_backend_result_to_result.py        |   28 ++++++++++++++++++++
 coprs_frontend/coprs/logic/coprs_logic.py          |    2 +-
 coprs_frontend/coprs/models.py                     |    4 +-
 .../coprs/views/backend_ns/backend_general.py      |    6 ++--
 coprs_frontend/tests/coprs_test_case.py            |    2 +-
 .../test_backend_ns/test_backend_general.py        |   14 +++++-----
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py b/coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py
new file mode 100644
index 0000000..1a5bd3a
--- /dev/null
+++ b/coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py
@@ -0,0 +1,28 @@
+"""backend_result_to_result
+
+Revision ID: d062c3d9c00
+Revises: 451e9507b866
+Create Date: 2013-04-03 10:10:35.990681
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'd062c3d9c00'
+down_revision = '451e9507b866'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('action', sa.Column('result', sa.Integer(), nullable=True))
+    op.drop_column('action', u'backend_result')
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('action', sa.Column(u'backend_result', sa.INTEGER(), nullable=True))
+    op.drop_column('action', 'result')
+    ### end Alembic commands ###
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py
index 2c15df0..0066b1d 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -155,7 +155,7 @@ class CoprsLogic(object):
                             helpers.ActionTypeEnum('delete')]
         actions = models.Action.query.filter(models.Action.object_type=='copr').\
                                       filter(models.Action.object_id==copr.id).\
-                                      filter(models.Action.backend_result==helpers.BackendResultEnum('waiting')).\
+                                      filter(models.Action.result==helpers.BackendResultEnum('waiting')).\
                                       filter(models.Action.action_type.in_(blocking_actions))
 
         return actions
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index 3beac64..b905831 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -280,8 +280,8 @@ class Action(db.Model, Serializer):
     # old and new values of the changed property
     old_value = db.Column(db.String(255))
     new_value = db.Column(db.String(255))
-    # backend result, see helpers.BackendResultEnum
-    backend_result = db.Column(db.Integer, default=helpers.BackendResultEnum('waiting'))
+    # result of the action, see helpers.BackendResultEnum
+    result = db.Column(db.Integer, default=helpers.BackendResultEnum('waiting'))
     # optional message from the backend/whatever
     message = db.Column(db.Text)
     # time created as returned by int(time.time())
diff --git a/coprs_frontend/coprs/views/backend_ns/backend_general.py b/coprs_frontend/coprs/views/backend_ns/backend_general.py
index 1f9c4f1..dfdc97d 100644
--- a/coprs_frontend/coprs/views/backend_ns/backend_general.py
+++ b/coprs_frontend/coprs/views/backend_ns/backend_general.py
@@ -44,9 +44,9 @@ def update_builds():
 
 @backend_ns.route('/waiting_actions/')
 def waiting_actions():
-    actions = models.Action.query.filter(models.Action.backend_result==helpers.BackendResultEnum('waiting')).all()
+    actions = models.Action.query.filter(models.Action.result==helpers.BackendResultEnum('waiting')).all()
 
-    return flask.jsonify({'actions': [action.to_dict(options={'__columns_except__': ['backend_result', 'message', 'ended_on']}) for action in actions]})
+    return flask.jsonify({'actions': [action.to_dict(options={'__columns_except__': ['result', 'message', 'ended_on']}) for action in actions]})
 
 # TODO: this is very similar to update_builds, we should pull out the common functionality into a single function
 @backend_ns.route('/update_actions/', methods=['POST', 'PUT'])
@@ -66,7 +66,7 @@ def update_actions():
     non_existing_ids = list(set(to_update.keys()) - set(existing.keys()))
 
     for i, action in existing.items():
-        existing[i].backend_result = to_update[i]['backend_result']
+        existing[i].result = to_update[i]['result']
         existing[i].message = to_update[i]['message']
         existing[i].ended_on = to_update[i]['ended_on']
 
diff --git a/coprs_frontend/tests/coprs_test_case.py b/coprs_frontend/tests/coprs_test_case.py
index bea1f58..6659bbf 100644
--- a/coprs_frontend/tests/coprs_test_case.py
+++ b/coprs_frontend/tests/coprs_test_case.py
@@ -119,6 +119,6 @@ class CoprsTestCase(object):
                                 object_id=100,
                                 old_value='asd/qwe',
                                 new_value=None,
-                                backend_result=helpers.BackendResultEnum('success'),
+                                result=helpers.BackendResultEnum('success'),
                                 created_on=int(time.time()))
         self.db.session.add_all([self.a1, self.a2, self.a3])
diff --git a/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py b/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py
index 2d3270c..235ed98 100644
--- a/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py
+++ b/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py
@@ -142,7 +142,7 @@ class TestUpdateActions(CoprsTestCase):
   "actions":[
     {
       "id": 1,
-      "backend_result": 1,
+      "result": 1,
       "message": "no problem",
       "ended_on": 123
     }
@@ -153,19 +153,19 @@ class TestUpdateActions(CoprsTestCase):
   "actions":[
     {
       "id": 1,
-      "backend_result": 1,
+      "result": 1,
       "message": null,
       "ended_on": 1234
     },
     {
       "id": 2,
-      "backend_result": 2,
+      "result": 2,
       "message": "problem!",
       "ended_on": 12345
     },
     {
       "id": 100,
-      "backend_result": 123,
+      "result": 123,
       "message": "wheeeee!",
       "ended_on": 123456
     }
@@ -181,7 +181,7 @@ class TestUpdateActions(CoprsTestCase):
        assert json.loads(r.data)["non_existing_actions_ids"] == []
 
        updated = self.models.Action.query.filter(self.models.Action.id==1).first()
-       assert updated.backend_result == 1
+       assert updated.result == 1
        assert updated.message == "no problem"
        assert updated.ended_on == 123
 
@@ -194,11 +194,11 @@ class TestUpdateActions(CoprsTestCase):
        assert json.loads(r.data)["non_existing_actions_ids"] == [100]
 
        updated = self.models.Action.query.filter(self.models.Action.id==1).first()
-       assert updated.backend_result == 1
+       assert updated.result == 1
        assert updated.message == None
        assert updated.ended_on == 1234
 
        updated2 = self.models.Action.query.filter(self.models.Action.id==2).first()
-       assert updated2.backend_result == 2
+       assert updated2.result == 2
        assert updated2.message == "problem!"
        assert updated2.ended_on == 12345



More information about the copr-devel mailing list