]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd1b1a1 e5f0ed1)
Merge pull request #7131 from mjstapp/fix_topo_py2_iter
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 18 Sep 2020 22:15:43 +0000 (18:15 -0400)
committerGitHub <noreply@github.com>
Fri, 18 Sep 2020 22:15:43 +0000 (18:15 -0400)
tests: use .items instead of .iteritems in topotests

1  2 
tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py patch | diff1 | diff2 | blob | history
tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py patch | diff1 | diff2 | blob | history

diff --cc tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
index bdbe6e0f317f60a93420b258660ef2523d86c8a0,75e1c556bbfce4a3425375e34c7c706cde216ed7..01f895891c8ccd91f603462beb28e184223aefb7
mode 100755,100644..100644
--- 1/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
--- 2/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
+++ b/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
diff --cc tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
index 46f3cde0861b5fd4cf466d396117644c291af1d3,caa236b96c4f722c44be95604ffdba41f809f56a..9694fa982f058fbea4e64512a92a9c5856b93ed1
mode 100755,100644..100644
--- 1/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
--- 2/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
+++ b/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
Unnamed repository; edit this file 'description' to name the repository.