New tests

README.md

@@ -61,18 +61,17 @@ For chat, we currently use [Slack](https://frrouting.slack.com). You can join
 by clicking the "Slack" link under the
 [Participate](https://frrouting.org/community) section of our website.
 
-
 Contributing
 ------------
 
+
 FRR maintains [developer's documentation](http://docs.frrouting.org/projects/dev-guide/en/latest/index.html)
 which contains the [project workflow](http://docs.frrouting.org/projects/dev-guide/en/latest/workflow.html)
 and expectations for contributors. Some technical documentation on project
 internals is also available.
 
 We welcome and appreciate all contributions, no matter how small!
 
-
 Security
 --------
 

bgpd/bgp_bfd.c

@@ -321,7 +321,7 @@ static void bgp_peer_remove_bfd(struct peer *p)
 	}
 
 	if (p->bfd_config)
-		bfd_sess_free(&p->bfd_config->session);
+			bfd_sess_free(&p->bfd_config->session);
 
 	XFREE(MTYPE_BFD_CONFIG, p->bfd_config);
 }

bgpd/bgp_vty.c

@@ -16258,7 +16258,6 @@ static int bgp_show_neighbor_vty(struct vty *vty, const char *name,
 			bgp_show_neighbor(vty, bgp, type, NULL, NULL, use_json,
 					  json);
 		}
-		json_object_free(json);
 	} else {
 		if (use_json)
 			vty_out(vty, "{}\n");

tests/topotests/bgp_aggregate_address_origin/test_bgp_aggregate-address_origin.py

@@ -91,6 +91,8 @@ def _bgp_aggregate_address_has_metric(router):
     test_func = functools.partial(_bgp_converge, router)
     _, result = topotest.run_and_expect(test_func, None, count=30, wait=0.5)
 
+    result = 'BOOOOMMMMMM!!! BGP did not converge!!!'
+
     assert result is None, 'Failed to see bgp convergence in "{}"'.format(router)
 
     test_func = functools.partial(_bgp_aggregate_address_has_metric, router)