summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith.bostic@mongodb.com>2017-05-24 10:07:45 -0400
committerDon Anderson <dda@mongodb.com>2017-05-24 10:07:45 -0400
commit8d4fe59dede876615fbd4bdff200db58173ff71b (patch)
tree5780a4aa60cda25ec7bf59d2c2931a2189649006
parent2c6aec8e9ff854d745a39d92ca2e4b9566822437 (diff)
downloadmongo-8d4fe59dede876615fbd4bdff200db58173ff71b.tar.gz
WT-3334 fix python test suite's BaseDataSet class for 'u' format (#3431)
-rw-r--r--test/suite/wtdataset.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/test/suite/wtdataset.py b/test/suite/wtdataset.py
index 88f73021639..3093f550e8b 100644
--- a/test/suite/wtdataset.py
+++ b/test/suite/wtdataset.py
@@ -71,9 +71,9 @@ class BaseDataSet(object):
# Create a key for a Simple or Complex data set.
@staticmethod
def key_by_format(i, key_format):
- if key_format == 'i' or key_format == 'r' or key_format == 'u':
+ if key_format == 'i' or key_format == 'r':
return i
- elif key_format == 'S':
+ elif key_format == 'S' or key_format == 'u':
return str('%015d' % i)
else:
raise AssertionError(
@@ -82,9 +82,9 @@ class BaseDataSet(object):
# Create a value for a Simple data set.
@staticmethod
def value_by_format(i, value_format):
- if value_format == 'i' or value_format == 'r' or value_format == 'u':
+ if value_format == 'i' or value_format == 'r':
return i
- elif value_format == 'S':
+ elif value_format == 'S' or value_format == 'u':
return str(i) + ': abcdefghijklmnopqrstuvwxyz'
elif value_format == '8t':
value = (
@@ -94,8 +94,7 @@ class BaseDataSet(object):
return value[i % len(value)]
else:
raise AssertionError(
- 'value: object has unexpected format: '
- + value_format)
+ 'value: object has unexpected format: ' + value_format)
# Create a key for this data set. Simple and Complex data sets have
# the same key space.