Commit 4960d441 authored by Andrei Vagin's avatar Andrei Vagin

zdtm.py: fix a logic about determing a test flavor in a error case

The get() method requires a key and now we are using an index. That
will never work correctly as it is now.
Acked-by: 's avatarAdrian Reber <adrian@lisas.de>
Reported-by: 's avatarAdrian Reber <adrian@lisas.de>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent faf4f72a
......@@ -282,6 +282,7 @@ class userns_flavor(ns_flavor):
flavors = {'h': host_flavor, 'ns': ns_flavor, 'uns': userns_flavor}
flavors_codes = dict(zip(xrange(len(flavors)), sorted(flavors.keys())))
#
# Helpers
......@@ -289,11 +290,11 @@ flavors = {'h': host_flavor, 'ns': ns_flavor, 'uns': userns_flavor}
def encode_flav(f):
return (flavors.keys().index(f) + 128)
return sorted(flavors.keys()).index(f) + 128
def decode_flav(i):
return flavors.get(i - 128, "unknown")
return flavors_codes.get(i - 128, "unknown")
def tail(path):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment