Merge lp:~arthur-she/lava-dashboard/fix-for-bug-1175597 into lp:lava-dashboard

[Arthur She]

Add "Equation" field (<=, ==, >=) to make the filter more flexible.

[Stevan Radaković (stevanr)]

Arthur, great work!

Couple of comments:

=== modified file 'dashboard_app/filters.py'
--- dashboard_app/filters.py 2013-01-09 00:15:10 +0000
+++ dashboard_app/filters.py 2013-06-05 10:06:54 +0000
@@ -365,13 +365,24 @@

     content_type_id = ContentType.objects.get_for_model(TestRun).id

- for (name, value) in filter_data['attributes']:
+ for (name, equation, value) in filter_data['attributes']:
         # We punch through the generic relation abstraction here for 100x
         # better performance.
- conditions.append(
- models.Q(id__in=NamedAttribute.objects.filter(
- name=name, value=value, content_type_id=content_type_id
- ).values('object_id')))
+ if equation == '>=':
+ conditions.append(
+ models.Q(id__in=NamedAttribute.objects.filter(
+ name=name, value__gte=value, content_type_id=content_type_id
+ ).values('object_id')))
+ elif equation == '<=':
+ conditions.append(
+ models.Q(id__in=NamedAttribute.objects.filter(
+ name=name, value__lte=value, content_type_id=content_type_id
+ ).values('object_id')))
+ else:
+ conditions.append(
+ models.Q(id__in=NamedAttribute.objects.filter(
+ name=name, value=value, content_type_id=content_type_id
+ ).values('object_id')))

I'd really like to see a more generic solution here... If we add more filter equations later, this code will have to be subjected to refactoring again and again. If we would have some kind of mapping like
equation_map = {"<=": "lte" ....}
we could use pyhon's argument packing, something like
kwargs = {
    '{0}__{1}'.format('value', 'lte'): value,
    '{0}__{1}'.format('value', 'gte'): value
}

NamedAttribute.objects.filter(**kwargs)

Second thing are the tests. I know the test coverage in dashboard is scarce, but do we want to keep it that way?

review: Needs Fixing (code)

[Stevan Radaković (stevanr)]

Sorry for the code paste, I hope it's clear what lines I'm referring to.

[Stevan Radaković (stevanr)]

One additional comment, we can circumvent the equation map altogether, if the db values for equation field would be defined as 'lte', 'gte'.. to start with. In the frontend we keep the '<=', '>=' of course...

[Arthur She (arthur-she)]

Thanks a lot, Stevan. It really helpful.
I'll modify it.

2013/6/5 Stevan Radaković <email address hidden>

> One additional comment, we can circumvent the equation map altogether, if
> the db values for equation field would be defined as 'lte', 'gte'.. to
> start with. In the frontend we keep the '<=', '>=' of course...
> --
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>

[Arthur She (arthur-she)]

Hi Stevan,
I know the idea, if we can make it more generic it should be better.
As you mentioned, we can use a dictionary to map the equation "equation_map
= {"<=": "lte", ">=": "gte", ""==": ""}"
and use argument packing, but I still don't have idea how to associate them
together. Could you talk more..

And regarding the tests, Tyler suggested me to do such modification. Do you
have any other idea to approach it?

Thanks a lot.
Arthur

2013/6/5 Stevan Radaković <email address hidden>

> Review: Needs Fixing code
>
> Arthur, great work!
>
> Couple of comments:
>
> === modified file 'dashboard_app/filters.py'
> --- dashboard_app/filters.py 2013-01-09 00:15:10 +0000
> +++ dashboard_app/filters.py 2013-06-05 10:06:54 +0000
> @@ -365,13 +365,24 @@
>
> content_type_id = ContentType.objects.get_for_model(TestRun).id
>
> - for (name, value) in filter_data['attributes']:
> + for (name, equation, value) in filter_data['attributes']:
> # We punch through the generic relation abstraction here for 100x
> # better performance.
> - conditions.append(
> - models.Q(id__in=NamedAttribute.objects.filter(
> - name=name, value=value, content_type_id=content_type_id
> - ).values('object_id')))
> + if equation == '>=':
> + conditions.append(
> + models.Q(id__in=NamedAttribute.objects.filter(
> + name=name, value__gte=value,
> content_type_id=content_type_id
> + ).values('object_id')))
> + elif equation == '<=':
> + conditions.append(
> + models.Q(id__in=NamedAttribute.objects.filter(
> + name=name, value__lte=value,
> content_type_id=content_type_id
> + ).values('object_id')))
> + else:
> + conditions.append(
> + models.Q(id__in=NamedAttribute.objects.filter(
> + name=name, value=value,
> content_type_id=content_type_id
> + ).values('object_id')))
>
> I'd really like to see a more generic solution here... If we add more
> filter equations later, this code will have to be subjected to refactoring
> again and again. If we would have some kind of mapping like
> equation_map = {"<=": "lte" ....}
> we could use pyhon's argument packing, something like
> kwargs = {
> '{0}__{1}'.format('value', 'lte'): value,
> '{0}__{1}'.format('value', 'gte'): value
> }
>
> NamedAttribute.objects.filter(**kwargs)
>
>
> Second thing are the tests. I know the test coverage in dashboard is
> scarce, but do we want to keep it that way?
> --
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>

[Arthur She (arthur-she)]

Stevan, do you mean, use
    equation = models.CharField(
            choices=(
                ('lte', '<='),
                ('eq', '=='),
                ('gte', '>=')),
            max_length=3, default='==')
instead of
    equation = models.CharField(
            choices=(
                ('<=', '<='),
                ('==', '=='),
                ('>=', '>=')),
            max_length=3, default='==')
in the class TestRunFilterAttribute

2013/6/5 Stevan Radaković <email address hidden>

> One additional comment, we can circumvent the equation map altogether, if
> the db values for equation field would be defined as 'lte', 'gte'.. to
> start with. In the frontend we keep the '<=', '>=' of course...
> --
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>

[Stevan Radaković (stevanr)]

Exactly like that!

On 06/06/2013 11:07 AM, Arthur She wrote:
> Stevan, do you mean, use
> equation = models.CharField(
> choices=(
> ('lte', '<='),
> ('eq', '=='),
> ('gte', '>=')),
> max_length=3, default='==')
> instead of
> equation = models.CharField(
> choices=(
> ('<=', '<='),
> ('==', '=='),
> ('>=', '>=')),
> max_length=3, default='==')
> in the class TestRunFilterAttribute
>
>
>
>
>
> 2013/6/5 Stevan Radaković <email address hidden>
>
>> One additional comment, we can circumvent the equation map altogether, if
>> the db values for equation field would be defined as 'lte', 'gte'.. to
>> start with. In the frontend we keep the '<=', '>=' of course...
>> --
>>
>> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
>> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>>

--
Stevan Radaković | LAVA Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[Stevan Radaković (stevanr)]

> Hi Stevan,
> I know the idea, if we can make it more generic it should be better.
> As you mentioned, we can use a dictionary to map the equation "equation_map
> = {"<=": "lte", ">=": "gte", ""==": ""}"
> and use argument packing, but I still don't have idea how to associate them
> together. Could you talk more..
>
> And regarding the tests, Tyler suggested me to do such modification. Do you
> have any other idea to approach it?
>
> Thanks a lot.
> Arthur
>

You can take a look at the lp:linaro-ci-dashboard it's also a django application and has a lot of good example for model tests. If you need more info about it please feel free to ping me on irc
>
> 2013/6/5 Stevan Radaković <email address hidden>
>
> > Review: Needs Fixing code
> >
> > Arthur, great work!
> >
> > Couple of comments:
> >
> > === modified file 'dashboard_app/filters.py'
> > --- dashboard_app/filters.py 2013-01-09 00:15:10 +0000
> > +++ dashboard_app/filters.py 2013-06-05 10:06:54 +0000
> > @@ -365,13 +365,24 @@
> >
> > content_type_id = ContentType.objects.get_for_model(TestRun).id
> >
> > - for (name, value) in filter_data['attributes']:
> > + for (name, equation, value) in filter_data['attributes']:
> > # We punch through the generic relation abstraction here for 100x
> > # better performance.
> > - conditions.append(
> > - models.Q(id__in=NamedAttribute.objects.filter(
> > - name=name, value=value, content_type_id=content_type_id
> > - ).values('object_id')))
> > + if equation == '>=':
> > + conditions.append(
> > + models.Q(id__in=NamedAttribute.objects.filter(
> > + name=name, value__gte=value,
> > content_type_id=content_type_id
> > + ).values('object_id')))
> > + elif equation == '<=':
> > + conditions.append(
> > + models.Q(id__in=NamedAttribute.objects.filter(
> > + name=name, value__lte=value,
> > content_type_id=content_type_id
> > + ).values('object_id')))
> > + else:
> > + conditions.append(
> > + models.Q(id__in=NamedAttribute.objects.filter(
> > + name=name, value=value,
> > content_type_id=content_type_id
> > + ).values('object_id')))
> >
> > I'd really like to see a more generic solution here... If we add more
> > filter equations later, this code will have to be subjected to refactoring
> > again and again. If we would have some kind of mapping like
> > equation_map = {"<=": "lte" ....}
> > we could use pyhon's argument packing, something like
> > kwargs = {
> > '{0}__{1}'.format('value', 'lte'): value,
> > '{0}__{1}'.format('value', 'gte'): value
> > }
> >
> > NamedAttribute.objects.filter(**kwargs)
> >
> >
> > Second thing are the tests. I know the test coverage in dashboard is
> > scarce, but do we want to keep it that way?
> > --
> >
> > https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-
> bug-1175597/+merge/167494
> > You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
> >

[Arthur She (arthur-she)]

Thanks a lot, Stevan. :)

2013/6/6 Stevan Radaković <email address hidden>

> > Hi Stevan,
> > I know the idea, if we can make it more generic it should be better.
> > As you mentioned, we can use a dictionary to map the equation
> "equation_map
> > = {"<=": "lte", ">=": "gte", ""==": ""}"
> > and use argument packing, but I still don't have idea how to associate
> them
> > together. Could you talk more..
> >
> > And regarding the tests, Tyler suggested me to do such modification. Do
> you
> > have any other idea to approach it?
> >
> > Thanks a lot.
> > Arthur
> >
>
> You can take a look at the lp:linaro-ci-dashboard it's also a django
> application and has a lot of good example for model tests. If you need more
> info about it please feel free to ping me on irc
> >
> > 2013/6/5 Stevan Radaković <email address hidden>
> >
> > > Review: Needs Fixing code
> > >
> > > Arthur, great work!
> > >
> > > Couple of comments:
> > >
> > > === modified file 'dashboard_app/filters.py'
> > > --- dashboard_app/filters.py 2013-01-09 00:15:10 +0000
> > > +++ dashboard_app/filters.py 2013-06-05 10:06:54 +0000
> > > @@ -365,13 +365,24 @@
> > >
> > > content_type_id = ContentType.objects.get_for_model(TestRun).id
> > >
> > > - for (name, value) in filter_data['attributes']:
> > > + for (name, equation, value) in filter_data['attributes']:
> > > # We punch through the generic relation abstraction here for
> 100x
> > > # better performance.
> > > - conditions.append(
> > > - models.Q(id__in=NamedAttribute.objects.filter(
> > > - name=name, value=value,
> content_type_id=content_type_id
> > > - ).values('object_id')))
> > > + if equation == '>=':
> > > + conditions.append(
> > > + models.Q(id__in=NamedAttribute.objects.filter(
> > > + name=name, value__gte=value,
> > > content_type_id=content_type_id
> > > + ).values('object_id')))
> > > + elif equation == '<=':
> > > + conditions.append(
> > > + models.Q(id__in=NamedAttribute.objects.filter(
> > > + name=name, value__lte=value,
> > > content_type_id=content_type_id
> > > + ).values('object_id')))
> > > + else:
> > > + conditions.append(
> > > + models.Q(id__in=NamedAttribute.objects.filter(
> > > + name=name, value=value,
> > > content_type_id=content_type_id
> > > + ).values('object_id')))
> > >
> > > I'd really like to see a more generic solution here... If we add more
> > > filter equations later, this code will have to be subjected to
> refactoring
> > > again and again. If we would have some kind of mapping like
> > > equation_map = {"<=": "lte" ....}
> > > we could use pyhon's argument packing, something like
> > > kwargs = {
> > > '{0}__{1}'.format('value', 'lte'): value,
> > > '{0}__{1}'.format('value', 'gte'): value
> > > }
> > >
> > > NamedAttribute.objects.filter(**kwargs)
> > >
> > >
> > > Second thing are the tests. I know the test coverage in dashboard is
> > > scarce, but do we want t...

[Stevan Radaković (stevanr)]

Hey Arthur,

so instead of all the if/else business, code would look something like this (maybe not 100% accurate didn't try it in the codebase:)

kwargs = {
    name: name,
    '{0}__{1}'.format('value', equation): value,
    content_type_id=content_type_id
}

conditions.append(models.Q(id__in=NamedAttribute.objects.filter(**kwargs).values('object_id')))

I may be missing some quotes but you'll figure it out :)

[Arthur She (arthur-she)]

Thanks a lot for your code, Stevan.
I think I might misunderstand your meaning for the "tests".
I'll check the code again...

2013/6/7 Stevan Radaković <email address hidden>

> Hey Arthur,
>
> so instead of all the if/else business, code would look something like
> this (maybe not 100% accurate didn't try it in the codebase:)
>
> kwargs = {
> name: name,
> '{0}__{1}'.format('value', equation): value,
> content_type_id=content_type_id
> }
>
>
> conditions.append(models.Q(id__in=NamedAttribute.objects.filter(**kwargs).values('object_id')))
>
> I may be missing some quotes but you'll figure it out :)
> --
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>

[lp:~arthur-she/lava-dashboard/fix-for-bug-1175597]

406. By Arthur She on 2013-06-11

Modify it to make it more generic.

modified:
  dashboard_app/filters.py
  dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py
  dashboard_app/models.py
  dashboard_app/views/filters/forms.py

407. By Arthur She on 2013-06-13

use display value instead of db value

modified:
  dashboard_app/models.py
  dashboard_app/templates/dashboard_app/filter_summary.html

[Stevan Radaković (stevanr)]

I've also noticed we're missing the "Attributes 'filter_name' <= 'value' " sting on the filter preview page, please add this as well.

[lp:~arthur-she/lava-dashboard/fix-for-bug-1175597]

408. By Arthur She on 2013-06-19

Show attributes on filter preview page.

modified:
  dashboard_app/templates/dashboard_app/filter_preview.html
  dashboard_app/views/filters/forms.py

[Arthur She (arthur-she)]

Thanks a lot for your help, I've modified it and pushed to the server.

2013/6/18 Stevan Radaković <email address hidden>

> I've also noticed we're missing the "Attributes 'filter_name' <= 'value' "
> sting on the filter preview page, please add this as well.
> --
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>

[Stevan Radaković (stevanr)]

Ok this looks like good to go now.
Thanks Arthur.
Approve +1.

review: Approve

[Arthur She (arthur-she)]

Thanks, Stevan :)

2013/6/24 Stevan Radaković <email address hidden>

> The proposal to merge lp:~arthur-she/lava-dashboard/fix-for-bug-1175597
> into lp:lava-dashboard has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> --
>
> https://code.launchpad.net/~arthur-she/lava-dashboard/fix-for-bug-1175597/+merge/167494
> You are the owner of lp:~arthur-she/lava-dashboard/fix-for-bug-1175597.
>

Unmerged revisions

408. By Arthur She on 2013-06-19

Show attributes on filter preview page.

modified:
  dashboard_app/templates/dashboard_app/filter_preview.html
  dashboard_app/views/filters/forms.py

407. By Arthur She on 2013-06-13

use display value instead of db value

modified:
  dashboard_app/models.py
  dashboard_app/templates/dashboard_app/filter_summary.html

406. By Arthur She on 2013-06-11

Modify it to make it more generic.

modified:
  dashboard_app/filters.py
  dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py
  dashboard_app/models.py
  dashboard_app/views/filters/forms.py

405. By Arthur She on 2013-06-05

fix for bug #1175597

=== modified file 'dashboard_app/filters.py'
--- dashboard_app/filters.py	2013-01-09 00:15:10 +0000
+++ dashboard_app/filters.py	2013-06-19 08:00:38 +0000
@@ -365,13 +365,15 @@
 
     content_type_id = ContentType.objects.get_for_model(TestRun).id
 
-    for (name, value) in filter_data['attributes']:
+    for (name, equation, value) in filter_data['attributes']:
         # We punch through the generic relation abstraction here for 100x
         # better performance.
-        conditions.append(
-            models.Q(id__in=NamedAttribute.objects.filter(
-                name=name, value=value, content_type_id=content_type_id
-                ).values('object_id')))
+        kwargs = {
+            'name': name,
+            '{0}__{1}'.format('value', equation): value,
+            'content_type_id': content_type_id
+        }
+        conditions.append(models.Q(id__in=NamedAttribute.objects.filter(**kwargs).values('object_id')))
 
     test_condition = None
     for test in filter_data.get('tests', []):

=== added file 'dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py'
--- dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py	1970-01-01 00:00:00 +0000
+++ dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py	2013-06-19 08:00:38 +0000
@@ -0,0 +1,270 @@
+# -*- coding: 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 'TestRunFilterAttribute.equation'
+        db.add_column('dashboard_app_testrunfilterattribute', 'equation',
+                      self.gf('django.db.models.fields.CharField')(default='exact', max_length=6),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'TestRunFilterAttribute.equation'
+        db.delete_column('dashboard_app_testrunfilterattribute', 'equation')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'dashboard_app.attachment': {
+            'Meta': {'object_name': 'Attachment'},
+            'content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True'}),
+            'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'public_url': ('django.db.models.fields.URLField', [], {'max_length': '512', 'blank': 'True'})
+        },
+        'dashboard_app.bundle': {
+            'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'},
+            '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}),
+            '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}),
+            'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}),
+            'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'dashboard_app.bundledeserializationerror': {
+            'Meta': {'object_name': 'BundleDeserializationError'},
+            'bundle': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'deserialization_error'", 'unique': 'True', 'primary_key': 'True', 'to': "orm['dashboard_app.Bundle']"}),
+            'error_message': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'traceback': ('django.db.models.fields.TextField', [], {'max_length': '32768'})
+        },
+        'dashboard_app.bundlestream': {
+            'Meta': {'object_name': 'BundleStream'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'dashboard_app.hardwaredevice': {
+            'Meta': {'object_name': 'HardwareDevice'},
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'device_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'dashboard_app.image': {
+            'Meta': {'object_name': 'Image'},
+            'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': "orm['dashboard_app.TestRunFilter']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '1024'})
+        },
+        'dashboard_app.imageset': {
+            'Meta': {'object_name': 'ImageSet'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'images': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['dashboard_app.Image']", 'symmetrical': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'})
+        },
+        'dashboard_app.launchpadbug': {
+            'Meta': {'object_name': 'LaunchpadBug'},
+            'bug_id': ('django.db.models.fields.PositiveIntegerField', [], {'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'test_runs': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'launchpad_bugs'", 'symmetrical': 'False', 'to': "orm['dashboard_app.TestRun']"})
+        },
+        'dashboard_app.namedattribute': {
+            'Meta': {'unique_together': "(('object_id', 'name'),)", 'object_name': 'NamedAttribute'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {}),
+            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'dashboard_app.pmqabundlestream': {
+            'Meta': {'object_name': 'PMQABundleStream'},
+            'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['dashboard_app.BundleStream']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'dashboard_app.softwarepackage': {
+            'Meta': {'unique_together': "(('name', 'version'),)", 'object_name': 'SoftwarePackage'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'dashboard_app.softwarepackagescratch': {
+            'Meta': {'object_name': 'SoftwarePackageScratch'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'dashboard_app.softwaresource': {
+            'Meta': {'object_name': 'SoftwareSource'},
+            'branch_revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'branch_url': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'branch_vcs': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'commit_timestamp': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project_name': ('django.db.models.fields.CharField', [], {'max_length': '32'})
+        },
+        'dashboard_app.tag': {
+            'Meta': {'object_name': 'Tag'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '256'})
+        },
+        'dashboard_app.test': {
+            'Meta': {'object_name': 'Test'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'test_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'})
+        },
+        'dashboard_app.testcase': {
+            'Meta': {'unique_together': "(('test', 'test_case_id'),)", 'object_name': 'TestCase'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_cases'", 'to': "orm['dashboard_app.Test']"}),
+            'test_case_id': ('django.db.models.fields.TextField', [], {}),
+            'units': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        'dashboard_app.testdefinition': {
+            'Meta': {'object_name': 'TestDefinition'},
+            'content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'environment': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'format': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'default': "'LOCAL'", 'max_length': '64'}),
+            'mime_type': ('django.db.models.fields.CharField', [], {'default': "'text/plain'", 'max_length': '64'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
+            'target_dev_types': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'target_os': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'dashboard_app.testresult': {
+            'Meta': {'ordering': "('_order',)", 'object_name': 'TestResult'},
+            '_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lineno': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'measurement': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '20', 'decimal_places': '10', 'blank': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'microseconds': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'relative_index': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'result': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            'test_case': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'test_results'", 'null': 'True', 'to': "orm['dashboard_app.TestCase']"}),
+            'test_run': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_results'", 'to': "orm['dashboard_app.TestRun']"}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'dashboard_app.testrun': {
+            'Meta': {'ordering': "['-import_assigned_date']", 'object_name': 'TestRun'},
+            'analyzer_assigned_date': ('django.db.models.fields.DateTimeField', [], {}),
+            'analyzer_assigned_uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}),
+            'bundle': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_runs'", 'to': "orm['dashboard_app.Bundle']"}),
+            'devices': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.HardwareDevice']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_assigned_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'microseconds': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'packages': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.SoftwarePackage']"}),
+            'sources': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.SoftwareSource']"}),
+            'sw_image_desc': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.Tag']"}),
+            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_runs'", 'to': "orm['dashboard_app.Test']"}),
+            'time_check_performed': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'dashboard_app.testrundenormalization': {
+            'Meta': {'object_name': 'TestRunDenormalization'},
+            'count_fail': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'count_pass': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'count_skip': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'count_unknown': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'test_run': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'denormalization'", 'unique': 'True', 'primary_key': 'True', 'to': "orm['dashboard_app.TestRun']"})
+        },
+        'dashboard_app.testrunfilter': {
+            'Meta': {'unique_together': "(('owner', 'name'),)", 'object_name': 'TestRunFilter'},
+            'build_number_attribute': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'bundle_streams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['dashboard_app.BundleStream']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '1024'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"})
+        },
+        'dashboard_app.testrunfilterattribute': {
+            'Meta': {'object_name': 'TestRunFilterAttribute'},
+            'equation': ('django.db.models.fields.CharField', [], {'default': "'exact'", 'max_length': '6'}),
+            'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attributes'", 'to': "orm['dashboard_app.TestRunFilter']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'dashboard_app.testrunfiltersubscription': {
+            'Meta': {'unique_together': "(('user', 'filter'),)", 'object_name': 'TestRunFilterSubscription'},
+            'filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dashboard_app.TestRunFilter']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'dashboard_app.testrunfiltertest': {
+            'Meta': {'object_name': 'TestRunFilterTest'},
+            'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tests'", 'to': "orm['dashboard_app.TestRunFilter']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'index': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['dashboard_app.Test']"})
+        },
+        'dashboard_app.testrunfiltertestcase': {
+            'Meta': {'object_name': 'TestRunFilterTestCase'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'index': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'cases'", 'to': "orm['dashboard_app.TestRunFilterTest']"}),
+            'test_case': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['dashboard_app.TestCase']"})
+        }
+    }
+
+    complete_apps = ['dashboard_app']
\ No newline at end of file

=== modified file 'dashboard_app/models.py'
--- dashboard_app/models.py	2013-04-01 08:50:05 +0000
+++ dashboard_app/models.py	2013-06-19 08:00:38 +0000
@@ -1566,11 +1566,17 @@
 
     name = models.CharField(max_length=1024)
     value = models.CharField(max_length=1024)
+    equation = models.CharField(
+            choices=(
+                ('lte', '<='),
+                ('exact', '=='),
+                ('gte', '>=')),
+            max_length=6, default='exact')
 
     filter = models.ForeignKey("TestRunFilter", related_name="attributes")
 
     def __unicode__(self):
-        return '%s = %s' % (self.name, self.value)
+        return '%s %s %s' % (self.name, self.get_equation_display(), self.value)
 
 
 class TestRunFilterTest(models.Model):
@@ -1633,9 +1639,14 @@
                 'test': trftest.test,
                 'test_cases': [trftestcase.test_case for trftestcase in trftest.cases.all().select_related('test_case')],
                 })
+        att = []
+        for a in self.attributes.all():
+            b = (a.name, a.get_equation_display(), a.value)
+            att.append(b)
         return {
             'bundle_streams': self.bundle_streams.all(),
-            'attributes': self.attributes.all().values_list('name', 'value'),
+            'attributes': self.attributes.all().values_list('name', 'equation', 'value'),
+            'attr_display': att,
             'tests': tests,
             'build_number_attribute': self.build_number_attribute,
             'uploaded_by': self.uploaded_by,

=== modified file 'dashboard_app/templates/dashboard_app/filter_form.html'
--- dashboard_app/templates/dashboard_app/filter_form.html	2012-09-19 22:56:03 +0000
+++ dashboard_app/templates/dashboard_app/filter_form.html	2013-06-19 08:00:38 +0000
@@ -42,6 +42,9 @@
                 Name
               </th>
               <th>
+                Equation
+              </th>
+              <th>
                 Value
               </th>
             </tr>
@@ -54,6 +57,9 @@
                 {{ form.name }}
               </td>
               <td class="value">
+                {{ form.equation }}
+              </td>
+              <td class="value">
                 {{ form.value }}
               </td>
               <td>
@@ -70,6 +76,9 @@
               <td class="name">
                 {{ form.name }}
               </td>
+              <td class="equation">
+                {{ form.equation }}
+              </td>
               <td class="value">
                 {{ form.value }}
               </td>

=== modified file 'dashboard_app/templates/dashboard_app/filter_preview.html'
--- dashboard_app/templates/dashboard_app/filter_preview.html	2013-01-09 00:05:14 +0000
+++ dashboard_app/templates/dashboard_app/filter_preview.html	2013-06-19 08:00:38 +0000
@@ -14,7 +14,7 @@
 <h1>Previewing new filter &ldquo;{{ form.name.value }}&rdquo;</h1>
 {% endif %}
 
-{% include "dashboard_app/filter_summary.html" with summary_data=filter.as_data %}
+{% include "dashboard_app/filter_summary.html" with filter_data=form.as_data %}
 
 <p>
   These are the results matched by your filter.

=== modified file 'dashboard_app/templates/dashboard_app/filter_summary.html'
--- dashboard_app/templates/dashboard_app/filter_summary.html	2012-12-12 23:49:01 +0000
+++ dashboard_app/templates/dashboard_app/filter_summary.html	2013-06-19 08:00:38 +0000
@@ -9,14 +9,14 @@
     {% endfor %}
     </td>
   </tr>
-{% if filter_data.attributes %}
+{% if filter_data.attr_display %}
   <tr>
     <th>
       Attributes
     </th>
     <td>
-    {% for a in filter_data.attributes %}
-    {{ a.0 }} == {{ a.1 }} <br />
+    {% for a in filter_data.attr_display %}
+    {{ a.0 }} {{ a.1 }} {{ a.2 }} <br />
     {% endfor %}
     </td>
   </tr>

=== modified file 'dashboard_app/views/filters/forms.py'
--- dashboard_app/views/filters/forms.py	2013-01-09 00:14:58 +0000
+++ dashboard_app/views/filters/forms.py	2013-06-19 08:00:38 +0000
@@ -63,6 +63,11 @@
 class AttributesForm(forms.Form):
     name = forms.CharField(max_length=1024)
     value = forms.CharField(max_length=1024)
+    equation = forms.ChoiceField(
+            choices=[
+                ('lte', '<='),
+                ('exact', '=='),
+                ('gte', '>=')])
 
 AttributesFormSet = formset_factory(AttributesForm, extra=0)
 
@@ -170,7 +175,7 @@
         if commit:
             instance.attributes.all().delete()
             for a in self.attributes_formset.cleaned_data:
-                instance.attributes.create(name=a['name'], value=a['value'])
+                instance.attributes.create(name=a['name'], equation=a['equation'], value=a['value'])
             instance.tests.all().delete()
             for i, test_form in enumerate(self.tests_formset.forms):
                 trf_test = instance.tests.create(
@@ -201,8 +206,15 @@
                     tc_form.cleaned_data['test_case']
                     for tc_form in form.test_case_formset]
                     })
+        att = []
+        for form in self.attributes_formset.forms:
+            att.append((
+                form.cleaned_data['name'],
+                dict(form.fields['equation'].choices)[form.cleaned_data['equation']],
+                form.cleaned_data['value']))
+        data['attr_display'] = att
         data['attributes'] = [
-            (d['name'], d['value']) for d in self.attributes_formset.cleaned_data]
+            (d['name'], d['equation'], d['value']) for d in self.attributes_formset.cleaned_data]
         data['tests'] = tests
         data['uploaded_by'] = None
         return data
@@ -218,6 +230,7 @@
             for attr in self.instance.attributes.all():
                 initial.append({
                     'name': attr.name,
+                    'equation': attr.equation,
                     'value': attr.value,
                     })
             attr_set_args['initial'] = initial