From 3e553f873d897fcbb665d55af3ff08fd18d726f0 Mon Sep 17 00:00:00 2001 From: Casey Dahlin Date: Sun, 4 Jan 2009 09:48:32 -0500 Subject: Remove extraneous wildcards from testcase --- statemachine.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/statemachine.py b/statemachine.py index b56dca9..892dde6 100644 --- a/statemachine.py +++ b/statemachine.py @@ -118,12 +118,12 @@ def any(): return nm() # Match anything. Implementation rea if __name__ == "__main__": sm = StateMachine() sm.deps.append((Category("mounted", type=m("nfs")), Category("network_up"))) - sm.deps.append((Category("mounted", uuid=any(), devname=any(), label=any(), type=nm("nfs")), Category("found_disk", uuid=any(), devname=any(), label=any()))) - sm.deps.append((Category("mounted", uuid=any(), devname=any(), label=any()), Category("vol_conf", uuid=any(), devname=any(), label=any()))) + sm.deps.append((Category("mounted", type=nm("nfs")), Category("found_disk"))) + sm.deps.append((Category("mounted"), Category("vol_conf"))) sm.bring_up(Category("network_up")) - sm.bring_up(Category("vol_conf", uuid=any(), devname=any(), label=m("myroot"), type=m("ext3"), mountpoint=m("/"))) - sm.bring_up(Category("vol_conf", uuid=any(), devname=m("foosrv.com:/vol/home"), label=any(), type=m("nfs"), mountpoint=m("/home"))) - sm.bring_up(Category("vol_conf", uuid=any(), devname=m("foosrv.com:/vol/beefs"), label=any(), type=m("nfs"), mountpoint=m("/beefs"))) + sm.bring_up(Category("vol_conf", label=m("myroot"), type=m("ext3"), mountpoint=m("/"))) + sm.bring_up(Category("vol_conf", devname=m("foosrv.com:/vol/home"), type=m("nfs"), mountpoint=m("/home"))) + sm.bring_up(Category("vol_conf", devname=m("foosrv.com:/vol/beefs"), type=m("nfs"), mountpoint=m("/beefs"))) sm.bring_up(Category("found_disk", uuid=m("d3adb3ef"), devname=m("/dev/sda"), label=m("myroot"))) sm.bring_up(Category("mounted", devname=any(), mountpoint=any())) print sm -- cgit