Changeset 30340

Timestamp:

2015-12-03T16:30:26+13:00 (8 years ago)

Author:

jmt12

Message:

Minor changes to support drivers that don't support set_entry functionality

File:

• gs2-extensions/tdb/trunk/perllib/dbutil.pm (modified) (4 diffs)

gs2-extensions/tdb/trunk/perllib/dbutil.pm

@@ -69 +69 @@
 my $test_count = 0;
 my $pass_count = 0;
+my $skip_count = 0;
 
 
@@ -287 +288 @@
         &_printTest('read keys', (defined $keys1->{'Alpha'} && defined $keys1->{'Beta'}));
         # 6. Set entry
-        my $status = $driver->set_infodb_entry($db_path, 'Alpha', $data2);
-        &_printTest('set entry (1)', ($status >= 0));
-        my $data5 = $driver->read_infodb_entry($db_path, 'Alpha');
-        &_printTest('set entry (2)', &_compareHash($data2, $data5));
+        if ($driver->supportsSet()) {
+        my $status = $driver->set_infodb_entry($db_path, 'Alpha', $data2);
+        &_printTest('set entry (1)', ($status >= 0));
+        my $data5 = $driver->read_infodb_entry($db_path, 'Alpha');
+        &_printTest('set entry (2)', &_compareHash($data2, $data5));
+        }
+        else {
+        $test_count += 2;
+        $skip_count += 2;
+        print " - Skipping 2 tests as 'set' is not supported by this driver.\n";
+        }
         # 7. Delete entry
-        my $db_handle2 = $driver->open_infodb_write_handle($db_path, '-append');
+        my $db_handle2 = $driver->open_infodb_write_handle($db_path, 'append');
         $driver->delete_infodb_entry($db_handle2, 'Alpha');
         $driver->close_infodb_handle($db_handle2);
@@ -299 +307 @@
         &_printTest('delete entry', ((!defined $keys2->{'Alpha'}) && (defined $keys2->{'Beta'})));
         # 8. Remove test db
-        unlink($db_path);
+        #unlink($db_path);
     }
     print "===== Results =====\n";
@@ -305 +313 @@
     print "Tests Run:      " . $test_count . "\n";
     print "Tests Passed:   " . $pass_count . "\n";
-    print "Tests Failed:   " . ($test_count - $pass_count) . "\n";
+    print "Tests Failed:   " . ($test_count - $pass_count - $skip_count) . "\n";
+    print "Tests Skipped:  " . $skip_count . "\n";
     }
     else