]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Fix mock return settings in test_full_uuids_skip_port_id_lookup
authorDane LeBlanc <leblancd@cisco.com>
Tue, 14 Apr 2015 15:05:40 +0000 (11:05 -0400)
committerDane LeBlanc <leblancd@cisco.com>
Tue, 14 Apr 2015 15:05:40 +0000 (11:05 -0400)
commit391c1b8cc1fc6f024232bef65bb5deb77357f294
treedf09d6307eb4a8389d41d9506f3abdfedb563f45
parent3d205937de81db608e4b0e5d6b364ef502f78401
Fix mock return settings in test_full_uuids_skip_port_id_lookup

In the test_full_uuids_skip_port_id_lookup test in test_security_group.py,
there are a couple of problems with how a mock return value is being set
for a database query.

The first problem is that in this line:
    fmock = sess_mock.query.return_value.outerjoin.return_value.filter
there is a missing '.return_value' missing between 'sess_mock' and 'query'.

The second problem is that in this line:
    fmock.return_value.all.return_value = []
the 'all.return_value' should not be used.

For reference, the query for which this mock return value is being set
is in the get_sg_ids_grouped_by_port() method in ML2's db.py:
        query = session.query(models_v2.Port,
                              sg_db.SecurityGroupPortBinding.security_group_id)
        query = query.outerjoin(sg_db.SecurityGroupPortBinding,
                                models_v2.Port.id == sg_binding_port)
        query = query.filter(or_(*or_criteria))

This patch fixes the problems mentioned above so that the query above
returns an empty list for the test_full_uuids_skip_port_id_lookup test.

Change-Id: I2cec2c27fcdc82557c91205d202a6ac79987e92a
Closes-Bug: 1444009
neutron/tests/unit/plugins/ml2/test_security_group.py