Merge lp://staging/~tribaal/landscape-client/remove-mocker-broker-client into lp://staging/~landscape/landscape-client/trunk

Proposed by Chris Glass
Status: Merged
Approved by: Chris Glass
Approved revision: 874
Merged at revision: 886
Proposed branch: lp://staging/~tribaal/landscape-client/remove-mocker-broker-client
Merge into: lp://staging/~landscape/landscape-client/trunk
Diff against target: 255 lines (+51/-53)
1 file modified
landscape/broker/tests/test_client.py (+51/-53)
To merge this branch: bzr merge lp://staging/~tribaal/landscape-client/remove-mocker-broker-client
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Approve
Bogdana Vereha (community) Approve
Geoff Teale (community) Approve
Review via email: mp+297575@code.staging.launchpad.net

Commit message

s/mocker/mock/

Description of the change

s/mocker/mock/

Testing instructions:

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 872
Branch: lp:~tribaal/landscape-client/remove-mocker-broker-client
Jenkins: https://ci.lscape.net/job/latch-test/5073/

review: Approve (test results)
Revision history for this message
Geoff Teale (tealeg) wrote :

+1 All good.

review: Approve
Revision history for this message
Bogdana Vereha (bogdana) wrote :

Looks good, although I'd really like to get rid of the unnecessary mocks (see inline comment).

review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 873
Branch: lp:~tribaal/landscape-client/remove-mocker-broker-client
Jenkins: https://ci.lscape.net/job/latch-test/5080/

review: Approve (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :
Download full text (188.1 KiB)

The attempt to merge lp:~tribaal/landscape-client/remove-mocker-broker-client into lp:landscape-client failed. Below is the output from the failed tests.

python setup.py build_ext -i
running build_ext
Running 2172 tests.
landscape.broker.tests.test_amp
  RemoteBrokerTest
    test_exit ... [OK]
    test_call_if_accepted ... [OK]
    test_call_on_events ... [OK]
    test_call_if_accepted_with_not_accepted ... [OK]
    test_get_server_uuid ... [OK]
    test_get_accepted_message_types ... [OK]
    test_fire_event ... [OK]
    test_is_message_pending ... [OK]
    test_method_call_error ... [OK]
    test_ping ... [OK]
    test_listen_events ... [OK]
    test_register ... [OK]
    test_reload_configuration ... [OK]
    test_register_client ... [OK]
    test_register_client_accepted_message_type ... [OK]
    test_stop_clients ... [OK]
    test_send_message_with_urgent ... [OK]
  RemoteClientTest
    test_exit ... [OK]
    test_fire_event ... [OK]
    test_message ... [OK]
  RemoteBrokerTest
    test_send_message ... [OK]
  RemoteClientTest
    test_method_call_error ... [OK]
    test_ping ... [OK]
landscape.broker.tests.test_client
  BrokerClientTest
    test_add ... [OK]
    test_dispatch_message ... [OK]
    test_dispatch_message_with_exception ... [OK]
    test_dispatch_message_with_no_handler ... [OK]
    test_exchange ... [OK]
    test_exchange_on_plugin_without_exchange_method ... [OK]
    test_exchange_logs_errors_and_continues ... [OK]
    test_exit ... [OK]
    test_fire_event ... [OK]
    test_fire_event_with_acceptance_changed ... [OK]
    test_fire_event_with_arguments ... [OK]
    test_get_named_plugin ... [OK]
    test_fire_ev...

874. By Chris Glass

Merge trunk

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

No approved revision specified.

Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 874
Branch: lp:~tribaal/landscape-client/remove-mocker-broker-client
Jenkins: https://ci.lscape.net/job/latch-test/5082/

review: Approve (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 874
Branch: lp:~tribaal/landscape-client/remove-mocker-broker-client
Jenkins: https://ci.lscape.net/job/latch-test/5083/

review: Approve (test results)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: