[Monotone-commits-diffs] net.venge.monotone.list_workspaces: 80973bf69ab4da2c7f01cee0b7e67dc47f7bea6f

[code]

revision:            80973bf69ab4da2c7f01cee0b7e67dc47f7bea6f
date:                2011-01-12T12:37:27
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.list_workspaces
changelog:
Because 'mtn setup' now registers the workspace being set up, two
tests need a bit of tweeking.

manifest:
format_version "1"

new_manifest [2fa7b137027835a9e8477448b3bd18594ccc53a6]

old_revision [cb6687e46fc6d115f51e888bf6c8b655fa524036]

patch "tests/add,remove,cleanup_registered_workspaces/__driver__.lua"
 from [113d8836d45c303084af212250de9ae5d866934f]
   to [45b1e28918b7f26d5c8c612b6143702ec83c66a1]

patch "tests/automate_db_variables/__driver__.lua"
 from [b9e7288aacc0dd94b10534b832b59bbfefbb56b3]
   to [bcb8bac46243c2f506dac481ebe8036a075f8042]
============================================================
--- tests/automate_db_variables/__driver__.lua	b9e7288aacc0dd94b10534b832b59bbfefbb56b3
+++ tests/automate_db_variables/__driver__.lua	bcb8bac46243c2f506dac481ebe8036a075f8042
@@ -19,6 +19,8 @@ writefile("expected1",
 --
 
 writefile("expected1",
+	  'domain "database"\n' ..
+	  ' entry "known-workspaces" "' .. test.root .. '\n"\n\n' ..
           'domain "domain1"\n' ..
           ' entry "other_var" "value"\n' ..
           ' entry "var" "value"\n\n' ..
============================================================
--- tests/add,remove,cleanup_registered_workspaces/__driver__.lua	113d8836d45c303084af212250de9ae5d866934f
+++ tests/add,remove,cleanup_registered_workspaces/__driver__.lua	45b1e28918b7f26d5c8c612b6143702ec83c66a1
@@ -4,10 +4,6 @@ check(mtn("ls", "vars"), 0, true, false)
 testname="add,remove,cleanup_registered_workspaces"
 
 check(mtn("ls", "vars"), 0, true, false)
-check(not qgrep("database: known-workspaces", "stdout"))
-
-check(mtn("register_workspace"), 0, false, false)
-check(mtn("ls", "vars"), 0, true, false)
 check(qgrep("database: known-workspaces .+/"..testname, "stdout"))
 
 check(mtn("register_workspace", "foo"), 0, false, false)
@@ -16,6 +12,10 @@ check(nodb_mtn("db", "init", "-d", "othe
 check(qgrep(testname.."/foo", "stdout"))
 
 check(nodb_mtn("db", "init", "-d", "other.mtn"), 0, false, false)
+
+check(nodb_mtn("ls", "vars", "-d", "other.mtn"), 0, true, false)
+check(not qgrep("database: known-workspaces", "stdout"))
+
 check(nodb_mtn("setup", "-b", "bar", "-d", "other.mtn", "bar"), 0, false, false)
 check(mtn("register_workspace", "bar"), 0, false, false)
 check(mtn("ls", "vars"), 0, true, false)