Merge ~bladernr/plainbox-provider-checkbox:1667781 into plainbox-provider-checkbox:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Pierre Equoy
Approved revision: 16e040e7c95256529e40feebfae3bf6196152c1a
Merged at revision: bc145c122f4a3e898cf13ff87e30760f0b9750ed
Proposed branch: ~bladernr/plainbox-provider-checkbox:1667781
Merge into: plainbox-provider-checkbox:master
Diff against target: 18 lines (+3/-4)
1 file modified
bin/network (+3/-4)
Reviewer Review Type Date Requested Status
Pierre Equoy Approve
Review via email: mp+318287@code.launchpad.net

Description of the change

bin/network: dont exit if the target is not in the same subnet as the SUT, just warn and try it anyway. (Fixes bug when run in networks where the target IS in a different subnet with routes to reach the target).

To post a comment you must log in.
Revision history for this message
Pierre Equoy (pieq) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/network b/bin/network
2index 88fd931..4ebb786 100755
3--- a/bin/network
4+++ b/bin/network
5@@ -448,10 +448,9 @@ def make_target_list(iface, test_targets, log_warnings):
6 target = ipaddress.IPv4Address(test_target_ip)
7 if (target < first_addr) or (target > last_addr):
8 if log_warnings:
9- logging.warning("test server {} ({}) is NOT ".
10- format(test_target, target))
11- logging.warning("within {}; skipping".format(net))
12- return_list.remove(test_target)
13+ logging.warning("Test server {} ({}) is NOT within {}".
14+ format(test_target, target, net))
15+ logging.warning("This may cause test issues")
16 except ValueError:
17 if log_warnings:
18 logging.warning("Invalid address: {}; skipping".

Subscribers

People subscribed via source and target branches