test-ovsdb: Fix conditional statement.

Old version of python does not support the following conditional
statement syntax in one assignment:

   var = value1 if cond else value2

This commit fixes it by convert it back to use two assignments.

Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>

diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py
index 250f671..4f8d7ca 100644 (file)
--- a/tests/test-ovsdb.py
+++ b/tests/test-ovsdb.py
@@ -240,7 +240,10 @@ def idl_set(idl, commands, step):
             old_notify = idl.notify
 
             def notify(event, row, updates=None):
-                upcol = updates._data.keys()[0] if updates else None
+                if updates:
+                    upcol = updates._data.keys()[0]
+                else:
+                    upcol = None
                 events.append("%s|%s|%s" % (event, row.i, upcol))
                 idl.notify = old_notify