From f5913a27bf0305044ceef26bc944ae41163f7015 Mon Sep 17 00:00:00 2001
From: shaneh <shaneh@noemail.net>
Date: Wed, 1 Dec 2010 22:08:45 +0000
Subject: [PATCH] Make sure a test of multiplex shim doesn't fail if a file
 already exists.

FossilOrigin-Name: 80de240a329d8df4aa1e437711bf6ed889d92c5f
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/multiplex.test |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 11454b8eaa..ef73b6a73a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\sTCL\stest\scase\sfor\sconverting\sto\sWAL\smode\swith\smultiple\sconnections.\s\s\nAdded\sexception\sto\sthe\stest\scase\sfor\sWindows\sfor\snot\sbeing\sable\sto\sdelete\sthe\sopen\sjournal\sfile.
-D 2010-12-01T20:49:42
+C Make\ssure\sa\stest\sof\smultiplex\sshim\sdoesn't\sfail\sif\sa\sfile\salready\sexists.
+D 2010-12-01T22:08:46
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -565,7 +565,7 @@ F test/misc5.test 45b2e3ed5f79af2b4f38ae362eaf4c49674575bd
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test c5f4e6a82e04e71820c0f9f64f6733f04c8ae0ae
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
-F test/multiplex.test 6b19e95d572363f21d3e67bc984ec721a7a7158a
+F test/multiplex.test 3dffa3c64d9c360ed5fc4d306cb207f38ac61ac6
 F test/mutex1.test 5b71777fc127509cd257910c8db799de557a02de
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test a44e04df1486fcfb02d32468cbcd3c8e1e433723
@@ -893,7 +893,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7df43f4892e628ecb8a83c5ed2dce5e24f6dd529
-R 962ed990d1074944b6bf7c242b1c4bd6
+P 7061601f4935af483f4068d257d6f8a9c728fd33
+R be3df1fcdd63362b61d1190d0e50a188
 U shaneh
-Z 0fe38ffa95ac575a7b27d8a0b1441aa7
+Z a185b27bff85acc7f680ed6845cb5027
diff --git a/manifest.uuid b/manifest.uuid
index e9a18657a3..7853d65194 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7061601f4935af483f4068d257d6f8a9c728fd33
\ No newline at end of file
+80de240a329d8df4aa1e437711bf6ed889d92c5f
\ No newline at end of file
diff --git a/test/multiplex.test b/test/multiplex.test
index 2adbfcb693..cbcd32d5ea 100644
--- a/test/multiplex.test
+++ b/test/multiplex.test
@@ -26,7 +26,7 @@ proc multiplex_name {name chunk} {
   if {$chunk==0} { return $name }
   set num [format "%02d" $chunk]
   ifcapable {multiplex_ext_overwrite} {
-    set name [string range $name 0 [expr [string length $name]-2-1]]
+    set name [string range $name 0 [expr [string length $name]-2-1]]
   }
   return $name$num
 }
@@ -54,6 +54,9 @@ proc multiplex_delete {name} {
 
 db close
 
+multiplex_delete test.db
+multiplex_delete test2.db
+
 #-------------------------------------------------------------------------
 #   multiplex-1.1.*: Test initialize and shutdown.
 
@@ -123,7 +126,7 @@ do_test multiplex-2.2.1 {
 do_test multiplex-2.2.3 { file size [multiplex_name test.db 0] } {6144}
 
 do_test multiplex-2.3.1 {
-  sqlite3 db2 bak.db
+  sqlite3 db2 test2.db
   db2 close
 } {}