Skip to content

Commit

Permalink
eigrp-topo1: Cleanup leftover comments from previous commit
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Winter <[email protected]>
  • Loading branch information
mwinter-osr committed Sep 12, 2017
1 parent f5d720f commit 7630d45
Showing 1 changed file with 0 additions and 47 deletions.
47 changes: 0 additions & 47 deletions eigrp-topo1/test_eigrp_topo1.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,41 +167,6 @@ def test_eigrp_routes():
assert failures == 0, 'SHOW IP EIGRP failed for router {}:\n{}'.format(router.name, diff)


# def test_zebra_ipv4_routingTable():
# "Test 'show ip route'"

# tgen = get_topogen()
# # Don't run this test if we have any failure.
# if tgen.routers_have_failure():
# pytest.skip(tgen.errors)

# # Verify OSPFv2 Routing Table
# logger.info("Verifying Zebra IPv4 Routing Table")

# failures = 0
# router_list = tgen.routers().values()
# for router in router_list:
# refTableFile = '{}/{}/show_ip_route.ref'.format(CWD, router.name)

# # Read expected result from file
# expected = open(refTableFile).read().rstrip()

# # Actual output from router
# actual = router.vtysh_cmd('show ip route').rstrip()

# # Generate Diff
# diff = topotest.difflines(actual, expected,
# title1="actual Zebra IPv4 routing table",
# title2="expected Zebra IPv4 routing table")

# # Empty string if it matches, otherwise diff contains unified diff
# if diff:
# failures += 1
# else:
# logger.info('{} ok'.format(router.name))

# assert failures == 0, 'Zebra IPv4 Routing Table verification failed for router {}:\n{}'.format(router.name, diff)


def test_zebra_ipv4_routingTable():
"Test 'show ip route'"
Expand All @@ -218,21 +183,9 @@ def test_zebra_ipv4_routingTable():
refTableFile = '{}/{}/show_ip_route.json_ref'.format(CWD, router.name)
expected = json.loads(open(refTableFile).read())

# diff = topotest.json_cmp(output, expected)

assertmsg = 'Zebra IPv4 Routing Table verification failed for router {}'.format(router.name)
assert topotest.json_cmp(output, expected) is None, assertmsg

# # Empty string if it matches, otherwise diff contains unified diff
# if diff:
# logger.info('{} NOT ok'.format(router.name))
# print("diff = %s" % str(diff))
# failures += 1
# else:
# logger.info('{} ok'.format(router.name))

# assert failures == 0, 'Zebra IPv4 Routing Table verification failed for router {}:\n{}'.format(router.name, diff)


def test_shutdown_check_stderr():
if os.environ.get('TOPOTESTS_CHECK_STDERR') is None:
Expand Down

0 comments on commit 7630d45

Please sign in to comment.