Merge lp:~stevanr/linaro-ci-dashboard/build_results_xml into lp:linaro-ci-dashboard

[Stevan Radaković]

Add result_xml attr to the LoopBuild model.
Add schedule_build override for textfield_loop model.
Also add build view for android text field loop.

[Milo Casagrande (milo)]

Hey Stevan, it looks good to go for me.

review: Approve

=== modified file 'dashboard/frontend/android_textfield_loop/models/android_textfield_loop.py'
--- dashboard/frontend/android_textfield_loop/models/android_textfield_loop.py	2012-09-04 14:29:53 +0000
+++ dashboard/frontend/android_textfield_loop/models/android_textfield_loop.py	2012-09-05 14:04:21 +0000
@@ -31,7 +31,3 @@
     def can_chain_into():
         chain = [ANDROID_LOOP]
         return chain
-
-    def save(self, *args, **kwargs):
-        self.type = self.__class__.__name__
-        super(AndroidTextFieldLoop, self).save(*args, **kwargs)

=== modified file 'dashboard/frontend/android_textfield_loop/tests/test_android_textfield_loop_model.py'
--- dashboard/frontend/android_textfield_loop/tests/test_android_textfield_loop_model.py	2012-09-03 15:44:47 +0000
+++ dashboard/frontend/android_textfield_loop/tests/test_android_textfield_loop_model.py	2012-09-05 14:04:21 +0000
@@ -52,4 +52,13 @@
     def test_valid_values_wrong(self):
         self.assertEqual((False, self.NON_VALID_LINES),
                          AndroidTextFieldLoop.valid_values(
-                             self.NON_VALID_VALUES))
\ No newline at end of file
+                             self.NON_VALID_VALUES))
+
+    def test_schedule_build(self):
+        build = self.android_loop.schedule_build()
+        self.assertEqual(build.result_xml, self.VALID_DICT)
+        self.assertEqual(build.status, "success")
+
+    def test_schedule_build_invalid(self):
+        build = self.non_valid_android_loop.schedule_build()
+        self.assertEqual(build.result_xml, {})

=== modified file 'dashboard/frontend/android_textfield_loop/urls.py'
--- dashboard/frontend/android_textfield_loop/urls.py	2012-08-30 15:46:41 +0000
+++ dashboard/frontend/android_textfield_loop/urls.py	2012-09-05 14:04:21 +0000
@@ -22,6 +22,8 @@
     import AndroidTextFieldLoopUpdateView
 from frontend.android_textfield_loop.views.android_textfield_loop_detail_view \
     import AndroidTextFieldLoopDetailView
+from frontend.android_textfield_loop.views.android_textfield_loop_build_view \
+    import AndroidTextFieldLoopBuildView
 
 
 urlpatterns = patterns('',
@@ -34,4 +36,7 @@
     url(r'^android-text/update/(?P<slug>[\w|\W]+)/$',
         AndroidTextFieldLoopUpdateView.as_view(),
         name='AndroidTextFieldLoopUpdate'),
+    url(r'^android-text/build/(?P<slug>[\w|\W]+)/$',
+        AndroidTextFieldLoopBuildView.as_view(),
+        name='AndroidTextFieldLoopBuild'),
     )

=== added file 'dashboard/frontend/android_textfield_loop/views/android_textfield_loop_build_view.py'
--- dashboard/frontend/android_textfield_loop/views/android_textfield_loop_build_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/android_textfield_loop/views/android_textfield_loop_build_view.py	2012-09-05 14:04:21 +0000
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from frontend.android_textfield_loop.models.android_textfield_loop \
+  import AndroidTextFieldLoop
+from frontend.views.loop_build_view import LoopBuildView
+
+
+class AndroidTextFieldLoopBuildView(LoopBuildView):
+
+    model = AndroidTextFieldLoop

=== added file 'dashboard/frontend/migrations/0005_auto__add_field_loopbuild_result_xml.py'
--- dashboard/frontend/migrations/0005_auto__add_field_loopbuild_result_xml.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/migrations/0005_auto__add_field_loopbuild_result_xml.py	2012-09-05 14:04:21 +0000
@@ -0,0 +1,51 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'LoopBuild.result_xml'
+        db.add_column('frontend_loopbuild', 'result_xml', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'LoopBuild.result_xml'
+        db.delete_column('frontend_loopbuild', 'result_xml')
+
+
+    models = {
+        'frontend.loop': {
+            'Meta': {'object_name': 'Loop'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_official': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_restricted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'next_loop': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'previous_loop'", 'unique': 'True', 'null': 'True', 'to': "orm['frontend.Loop']"}),
+            'server': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['jenkinsserver.JenkinsServer']", 'null': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'frontend.loopbuild': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'LoopBuild'},
+            'build_number': ('django.db.models.fields.IntegerField', [], {'default': 'None'}),
+            'duration': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'loop': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['frontend.Loop']"}),
+            'remote_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'result_xml': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'jenkinsserver.jenkinsserver': {
+            'Meta': {'object_name': 'JenkinsServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['frontend']

=== modified file 'dashboard/frontend/models/loop_build.py'
--- dashboard/frontend/models/loop_build.py	2012-07-26 09:12:27 +0000
+++ dashboard/frontend/models/loop_build.py	2012-09-05 14:04:21 +0000
@@ -37,6 +37,7 @@
     remote_number = models.IntegerField(null=True, blank=True)
     status = models.CharField(max_length=20, choices=BUILD_STATUS)
     duration = models.DecimalField(max_digits=8, decimal_places=2)
+    result_xml = models.TextField(null=True, blank=True)
 
     def save(self, *args, **kwargs):
         loop_builds = LoopBuild.objects.filter(loop=self.loop).order_by("-id")

=== modified file 'dashboard/frontend/models/textfield_loop.py'
--- dashboard/frontend/models/textfield_loop.py	2012-09-03 15:44:21 +0000
+++ dashboard/frontend/models/textfield_loop.py	2012-09-05 14:04:21 +0000
@@ -40,7 +40,19 @@
     values = models.TextField()
 
     def schedule_build(self, parameters=None):
-        return None
+        from frontend.models.loop_build import LoopBuild
+        build = LoopBuild()
+        build.loop = self
+        build.duration = 0.00
+
+        try:
+            build.result_xml = self.values_to_dict()
+            build.status = 'success'
+        except:
+            build.status = 'failure'
+
+        build.save()
+        return build
 
     def values_to_dict(self):
         """