X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fnet_test;h=9daf8da082f369529df87af52429f41aa986a174;hp=b99a4acd54b4cbee689abdbdea62b874fbd7385e;hb=764ce7f2ab526c084f005186e0dcbabe59070247;hpb=d5853b48fb098ca63af813ae74cd6af3a9400d01

diff --git a/test/net_test b/test/net_test
old mode 100644
new mode 100755
index b99a4acd5..9daf8da08
--- a/test/net_test
+++ b/test/net_test
@@ -3,47 +3,33 @@
 RULES=label_test.rules
 CONFIG=label_test.conf
 
-export UDEV_TEST=yes
 export SYSFS_PATH=$PWD/sys/
 export UDEV_CONFIG_FILE=$PWD/$CONFIG
 
 cat > $RULES << EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW   !#", NAME="boot_diskX%n"
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW    !#", NAME="boot_disk%n"
+SYSFS{address}="00:e0:00:8d:9f:25", NAME="wireless"
 EOF
 
 cat > $CONFIG << EOF
 udev_root="$PWD/udev/"
-udev_db="$PWD/udev/.udev.tdb"
+udev_db="$PWD/udev/.udevdb"
 udev_rules="$PWD/$RULES"
-udev_permissions="$PWD/udev.permissions"
 EOF
 
 mkdir udev
 
 export ACTION=add
-export DEVPATH=block/sda
+export DEVPATH=class/net/eth1
 
-../udev block
-ls -l udev
-
-export DEVPATH=block/sda/sda3
-
-../udev block
+../udevtest class/net/eth1 net
 ls -l udev
 
 export ACTION=remove
-export DEVPATH=block/sda
+export DEVPATH=class/net/eth1
 
-../udev block
+../udevtest class/net/eth1 net
 ls -l udev
 
-export DEVPATH=block/sda/sda3
-
-../udev block
-ls -l udev
-
-
 rm $RULES
 rm $CONFIG
 rm -rf udev